lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix : Warning: Invalid argument supplied for foreach()

Browse Source
This commit is contained in:
Philippe Grand 2011-02-20 20:17:48 +00:00
parent ad7a90345d
commit 949dbd8dc4
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,10 +449,12 @@ class Menubase
$newTabMenu=array(); $newTabMenu=array();
$i=0; $i=0;
foreach($tabMenu as $val) if (is_array($tabMenu))
{ {
if ($val[9]=='top') foreach($tabMenu as $val)
{ {
if ($val[9]=='top')
{
$newTabMenu[$i]['rowid']=$val[0]; $newTabMenu[$i]['rowid']=$val[0];
$newTabMenu[$i]['fk_menu']=$val[1]; $newTabMenu[$i]['fk_menu']=$val[1];
@ -466,8 +468,9 @@ class Menubase
$newTabMenu[$i]['type']=$val[9]; $newTabMenu[$i]['type']=$val[9];
$newTabMenu[$i]['lang']=$val[10]; $newTabMenu[$i]['lang']=$val[10];
$i++; $i++;
} }
} }
}
return $newTabMenu; return $newTabMenu;
} }
@ -500,14 +503,17 @@ class Menubase
// Define menutopid // Define menutopid
$menutopid=''; $menutopid='';
foreach($tabMenu as $val) if (is_array($tabMenu))
{ {
if ($val[9] == 'top' && $val[8] == $mainmenu) foreach($tabMenu as $val)
{ {
$menutopid=$val[0]; if ($val[9] == 'top' && $val[8] == $mainmenu)
break; {
} $menutopid=$val[0];
} break;
}
}
}
// Now edit this->newmenu->list to add entries found into tabMenu that are in childs of mainmenu claimed // Now edit this->newmenu->list to add entries found into tabMenu that are in childs of mainmenu claimed
$this->recur($tabMenu, $menutopid, 1, $leftmenu); $this->recur($tabMenu, $menutopid, 1, $leftmenu);