From 9b8a8351b4cf11ba49035781eb5a89daf927f55d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Mar 2013 13:22:51 +0100 Subject: [PATCH] Fix: Menu hidden --- htdocs/core/menus/standard/auguria.lib.php | 3 ++- htdocs/core/menus/standard/eldy.lib.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index e96fe021411..36bedd2398b 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -335,9 +335,10 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM */ function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexternal) { + global $conf; + //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms']; //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal); - if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition if ($type_user && $menuentry['module']) { diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index e5ea13ea1ae..a4dd6bbab9c 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1160,9 +1160,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu for ($i = 0; $i < $num; $i++) { $showmenu=true; - if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) { - $showmenu=false; - } + if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) $showmenu=false; $alt++; if (empty($menu_array[$i]['level']) && $showmenu) @@ -1268,6 +1266,8 @@ function print_jmobile_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu) */ function dol_eldy_showmenu($type_user, &$menuentry, &$listofmodulesforexternal) { + global $conf; + //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms']; //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal); if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition