diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 7d5dfdf9a1e..92b69884278 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -403,7 +403,7 @@ class Menubase * @param tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) * @return array Return array with menu entries for top menu */ - function menuTopCharger($mainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu=null) + function menuTopCharger($mainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu) { global $langs, $user, $conf; global $leftmenu,$rights; // To export to dol_eval function @@ -454,7 +454,7 @@ class Menubase * @param $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) * @return array Menu array for particular mainmenu value or full tabArray */ - function menuLeftCharger($newmenu, $mainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu=null) + function menuLeftCharger($newmenu, $mainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu) { global $langs, $user, $conf; // To export to dol_eval function global $leftmenu,$rights; // To export to dol_eval function @@ -496,10 +496,10 @@ class Menubase * @param $myleftmenu Value for left that defined leftmenu * @param $type_user 0=Internal,1=External,2=All * @param $menu_handler Name of menu_handler used (auguria, eldy...) - * @param $tabMenu If array with menu entries already load, we put this array here (in most cases, it's empty) + * @param &$tabMenu If array with menu entries already load, we put this array here (in most cases, it's empty) * @return int >0 if OK, <0 if KO */ - function menuLoad($myleftmenu, $type_user, $menu_handler, &$tabMenu=array()) + function menuLoad($myleftmenu, $type_user, $menu_handler, &$tabMenu) { global $langs, $user, $conf; // To export to dol_eval function global $leftmenu, $rights; // To export to dol_eval function diff --git a/htdocs/includes/menus/standard/auguria.lib.php b/htdocs/includes/menus/standard/auguria.lib.php index e7b05a7f95d..534adbeb595 100644 --- a/htdocs/includes/menus/standard/auguria.lib.php +++ b/htdocs/includes/menus/standard/auguria.lib.php @@ -43,8 +43,9 @@ function print_auguria_menu($db,$atarget,$type_user) if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"]; $_SESSION["leftmenuopened"]=""; + $tabMenu=array(); $menuArbo = new Menubase($db,'auguria','top'); - $newTabMenu = $menuArbo->menuTopCharger($_SESSION['mainmenu'], '', $type_user, 'auguria'); + $newTabMenu = $menuArbo->menuTopCharger($_SESSION['mainmenu'], '', $type_user, 'auguria',$tabMenu); print_start_menu_array_auguria(); @@ -218,8 +219,9 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after) { require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + $tabMenu=array(); $menuArbo = new Menubase($db,'auguria','left'); - $newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria'); + $newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu); //var_dump($newmenu); } diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 7df7bc212d9..fc4c9cc22c7 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -439,9 +439,9 @@ function print_eldy_menu($db,$atarget,$type_user) // Show personalized menus require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + $tabMenu=array(); $menuArbo = new Menubase($db,'eldy','top'); - - $newTabMenu = $menuArbo->menuTopCharger($_SESSION['mainmenu'],'',$type_user,'eldy'); + $newTabMenu = $menuArbo->menuTopCharger($_SESSION['mainmenu'],'',$type_user,'eldy',$tabMenu); for($i=0; $imenuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'eldy'); + $newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'eldy',$tabMenu); }