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

Fix: Avoid warning messages with some modules

Browse Source
This commit is contained in:
Laurent Destailleur 2011-12-21 18:31:39 +01:00
parent d3fbd51479
commit 3ecff7b4db
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/functions.lib.php
View File

@ -4283,7 +4283,8 @@ function picto_from_langcode($codelang)
} }
/** /**
* Complete or removed entries into a head array (used to build tabs) with value added by external modules * Complete or removed entries into a head array (used to build tabs) with value added by external modules.
* Such values are declared into $conf->tabs_modules.
* *
* @param Conf $conf Object conf * @param Conf $conf Object conf
* @param Translate $langs Object langs * @param Translate $langs Object langs
@ -4313,12 +4314,13 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
foreach ($conf->tabs_modules[$type] as $value) foreach ($conf->tabs_modules[$type] as $value)
{ {
$values=explode(':',$value); $values=explode(':',$value);
if ($mode == 'add' && ! preg_match('/^\-/',$values[1])) if ($mode == 'add' && ! preg_match('/^\-/',$values[1]))
{ {
if (count($values) == 6) // new declaration with permissions if (count($values) == 6) // new declaration with permissions: $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
{ {
if ($values[0] != $type) continue; if ($values[0] != $type) continue;
if (verifCond($values[4])) if (verifCond($values[4]))
{ {
if ($values[3]) $langs->load($values[3]); if ($values[3]) $langs->load($values[3]);
@ -4347,7 +4349,7 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
$h++; $h++;
} }
} }
else if ($mode == 'remove') else if ($mode == 'remove' && preg_match('/^\-/',$values[1]))
{ {
if ($values[0] != $type) continue; if ($values[0] != $type) continue;
$tabname=str_replace('-','',$values[1]); $tabname=str_replace('-','',$values[1]);