diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 156067a0b23..53c05be3bb4 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -412,7 +412,7 @@ class Menubase * @param array &$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 @@ -461,10 +461,10 @@ class Menubase * @param string $myleftmenu Value that defined leftmenu * @param int $type_user 0=Internal,1=External,2=All * @param string $menu_handler Name of menu_handler used (auguria, eldy...) - * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) + * @param array &$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 @@ -507,10 +507,10 @@ class Menubase * @param string $myleftmenu Value for left that defined leftmenu * @param int $type_user 0=Internal,1=External,2=All * @param string $menu_handler Name of menu_handler used (auguria, eldy...) - * @param array &$tabMenu If array with menu entries already load, we put this array here (in most cases, it's empty) + * @param array &$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/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 84253517cde..a1a18fb613b 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -42,11 +42,12 @@ 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(); - + $num = count($newTabMenu); for($i = 0; $i < $num; $i++) { @@ -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/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 2c6ab43242c..b886c26fca1 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -438,9 +438,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); $num = count($newTabMenu); for($i = 0; $i < $num; $i++) @@ -1327,8 +1327,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) // Affichage des menus personnalises require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + $tabMenu=array(); $menuArbo = new Menubase($db,'eldy','left'); - $newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'eldy'); + $newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'eldy',$tabMenu); }