diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0eec5f4d659..1b803046dd5 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1068,7 +1068,15 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a { if ($user->admin && ! $user->entity) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/multicompany/class/actions_multicompany.class.php'); + if(file_exists(DOL_DOCUMENT_ROOT.'/multicompany/class/actions_multicompany.class.php')) + { + $res=@include_once(DOL_DOCUMENT_ROOT.'/multicompany/class/actions_multicompany.class.php'); + } + else + { + $res=@include_once(DOL_DOCUMENT_EXTMODULE.'/multicompany/class/actions_multicompany.class.php'); + } + if ($res) { //$mc = new ActionsMulticompany($db); diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index aaa230d6a91..fc2b07f21da 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -214,13 +214,22 @@ if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $rowspan++; // Entity field if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY) && ! $disabled) { - require_once(DOL_DOCUMENT_ROOT.'/multicompany/class/actions_multicompany.class.php'); - global $db; + + if(file_exists(DOL_DOCUMENT_ROOT.'/multicompany/class/actions_multicompany.class.php')) + { + $res=@include_once(DOL_DOCUMENT_ROOT.'/multicompany/class/actions_multicompany.class.php'); + } + else + { + $res=@include_once(DOL_DOCUMENT_EXTMODULE.'/multicompany/class/actions_multicompany.class.php'); + } - $mc = new ActionsMulticompany($db); - - $select_entity = $mc->select_entities($mc->entities,$conf->entity,'tabindex="2"'); + if ($res) + { + $mc = new ActionsMulticompany($db); + $select_entity = $mc->select_entities($mc->entities,$conf->entity,'tabindex="2"'); + } } // Security graphical code