tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-07-01 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/menu.php, include/functions_menu.php: fixed the entry
	gis map in ACL enterprise.
	
	* index.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-01 11:01:20 +00:00
parent 684fa26079
commit 00bf47e9e5
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-07-01 Miguel de Dios <miguel.dedios@artica.es>
* godmode/menu.php, include/functions_menu.php: fixed the entry
gis map in ACL enterprise.
* index.php: cleaned source code style.
2013-07-01 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql

10
pandora_console/include/functions_menu.php
View File

@ -320,7 +320,6 @@ function menu_print_menu (&$menu) {
}
// Choose valid section (sec)
if (enterprise_hook ('enterprise_acl', array ($config['id_user'], $mainsec, $main["sec2"])) == false){
continue;
}
@ -443,6 +442,15 @@ function menu_add_extras(&$menu) {
}
$menu = array_merge_recursive($menu, $menu_extra);
//Remove the duplicate the text entries.
foreach ($menu as $k => $m) {
if (!empty($m['text'])) {
if (is_array($m['text'])) {
$menu[$k]['text'] = reset($m['text']);
}
}
}
}
/**