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

Fix: add is_object test

Browse Source
This commit is contained in:
Regis Houssin 2012-02-23 14:32:44 +01:00
parent 5c362a435d
commit 2624c7154b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/main.inc.php
View File

@ -1065,10 +1065,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
global $user, $conf, $langs, $db; global $user, $conf, $langs, $db;
global $dolibarr_main_authentication; global $dolibarr_main_authentication;
global $hookmanager; global $hookmanager;
global $mc; // TODO Remove this. This should not bee required because code called on MC must be inside the new hook toprightmenu
// Instantiate hooks of thirdparty module only if not already define // Instantiate hooks of thirdparty module only if not already define
if (!$hookmanager) if (! is_object($hookmanager))
{ {
include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
$hookmanager=new HookManager($db); $hookmanager=new HookManager($db);
@ -1324,7 +1323,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
$bookmarks=''; $bookmarks='';
// Instantiate hooks of thirdparty module // Instantiate hooks of thirdparty module
if (!$hookmanager) if (! is_object($hookmanager))
{ {
include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
$hookmanager=new HookManager($db); $hookmanager=new HookManager($db);