Qual: Make some refactoring to prepare speed enhancement in menu loading.
This commit is contained in:
parent
d418dddc50
commit
598d9d41d8
@ -431,7 +431,6 @@ class Menubase
|
|||||||
* @param type_user 0=Internal,1=External,2=All
|
* @param type_user 0=Internal,1=External,2=All
|
||||||
* @param mainmenu Value for mainmenu that defined top menu
|
* @param mainmenu Value for mainmenu that defined top menu
|
||||||
* @param menu_handler Name of menu_handler used (auguria, eldy...)
|
* @param menu_handler Name of menu_handler used (auguria, eldy...)
|
||||||
* @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
|
* @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=null)
|
||||||
@ -442,10 +441,7 @@ class Menubase
|
|||||||
$leftmenu=$myleftmenu; // To export to dol_eval function
|
$leftmenu=$myleftmenu; // To export to dol_eval function
|
||||||
|
|
||||||
// Load datas into tabMenu
|
// Load datas into tabMenu
|
||||||
if (sizeof($tabMenu) == 0)
|
|
||||||
{
|
|
||||||
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
|
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
|
||||||
}
|
|
||||||
|
|
||||||
$newTabMenu=array();
|
$newTabMenu=array();
|
||||||
$i=0;
|
$i=0;
|
||||||
@ -495,8 +491,12 @@ class Menubase
|
|||||||
if (sizeof($tabMenu) == 0)
|
if (sizeof($tabMenu) == 0)
|
||||||
{
|
{
|
||||||
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
|
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
|
||||||
}
|
|
||||||
//var_dump($tabMenu);
|
//var_dump($tabMenu);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
|
||||||
|
}
|
||||||
|
|
||||||
// Define menutopid
|
// Define menutopid
|
||||||
$menutopid='';
|
$menutopid='';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user