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

Fix: regression and use an exist alternative root

Browse Source
This commit is contained in:
Regis Houssin 2010-12-16 18:58:15 +00:00
parent c97516268c
commit 69631134d3
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/main.inc.php
View File

@ -1068,7 +1068,15 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
{ {
if ($user->admin && ! $user->entity) 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) if ($res)
{ {
//$mc = new ActionsMulticompany($db); //$mc = new ActionsMulticompany($db);

19
htdocs/user/passwordforgotten.php
View File

@ -214,13 +214,22 @@ if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $rowspan++;
// Entity field // Entity field
if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY) && ! $disabled) if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY) && ! $disabled)
{ {
require_once(DOL_DOCUMENT_ROOT.'/multicompany/class/actions_multicompany.class.php');
global $db; 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); if ($res)
{
$select_entity = $mc->select_entities($mc->entities,$conf->entity,'tabindex="2"'); $mc = new ActionsMulticompany($db);
$select_entity = $mc->select_entities($mc->entities,$conf->entity,'tabindex="2"');
}
} }
// Security graphical code // Security graphical code