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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-13 12:52:34 +02:00
commit f3e10c5a00
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/main.inc.php
View File

@ -1493,11 +1493,16 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$result=$hookmanager->executeHooks('printTopRightMenu',$parameters); // Note that $action and $object may have been modified by some hooks $result=$hookmanager->executeHooks('printTopRightMenu',$parameters); // Note that $action and $object may have been modified by some hooks
if (is_numeric($result)) if (is_numeric($result))
{ {
if (empty($result)) $toprightmenu.=$hookmanager->resPrint; // add if ($result == 0)
else $toprightmenu=$hookmanager->resPrint; // replace $toprightmenu.=$hookmanager->resPrint; // add
else
$toprightmenu=$hookmanager->resPrint; // replace
} }
else $toprightmenu.=$result; // For backward compatibility else
{
$toprightmenu.=$result; // For backward compatibility
}
// Link to module builder // Link to module builder
if (! empty($conf->modulebuilder->enabled)) if (! empty($conf->modulebuilder->enabled))
{ {