Skip to content
Snippets Groups Projects
Commit c4c3330c authored by Sebastian Paul's avatar Sebastian Paul
Browse files

Merge branch 'fixes'

Conflicts:
	unity_api.module
	unity_hud_menu/unity_hud_menu.module
parents 612329ea d77e418f
Branches
Tags
No related merge requests found
<?php
/**
* @file Unity Api Integration module.
* @file
* Unity Api Integration module.
*/
/**
* call hooks to build the links.
* @return
* Call hooks to build the links.
* @return $linkarray
* array with links from called hooks
*/
function unity_api_generate_links_array() {
......
<?php
/**
* @file
* submodule which generates links for unity_hud from menu_tree_all_data
* Submodule which generates links for unity_hud from menu_tree_all_data
*/
/**
* Walk through menu_tree and find the links.
* @return
* @return $linkarray
* array with links
*/
function unity_hud_menu_walk($object) {
......@@ -25,9 +25,8 @@ function unity_hud_menu_walk($object) {
}
/**
* implementation of hook_unityapi_addlinks
*
* @return
* Implements hook_unityapi_addlinks().
* @return $linkarray
* array with links
*/
function unity_hud_menu_unityapi_addlinks() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment