Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: No default value on var by pointer

Browse Source
This commit is contained in:
Laurent Destailleur
2011-11-26 18:32:14 +01:00
parent 20123524c5
commit 92a79b8cd5
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/menubase.class.php
View File

@@ -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

6
htdocs/includes/menus/standard/auguria.lib.php
View File

@@ -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);
}

7
htdocs/includes/menus/standard/eldy.lib.php
View File

@@ -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; $i<count($newTabMenu); $i++)
{
@@ -1311,8 +1311,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);
}