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

Fix: instantiate $mc object at the end

Browse Source
This commit is contained in:
Regis Houssin 2012-03-20 15:28:21 +01:00
parent ea65c45b2c
commit e02fe135db
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/core/class/conf.class.php
View File

@ -185,19 +185,7 @@ class Conf
} }
$i++; $i++;
} }
// Object $mc
if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled))
{
global $mc;
$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
if ($ret)
{
$mc = new ActionsMulticompany($db);
$mc->setValues($this);
}
}
$db->free($resql); $db->free($resql);
} }
//var_dump($this->modules); //var_dump($this->modules);
@ -388,6 +376,19 @@ class Conf
// For backward compatibility // For backward compatibility
if ($this->top_menu == 'eldy.php') $this->top_menu='eldy_backoffice.php'; if ($this->top_menu == 'eldy.php') $this->top_menu='eldy_backoffice.php';
elseif ($this->top_menu == 'rodolphe.php') $this->top_menu='eldy_backoffice.php'; elseif ($this->top_menu == 'rodolphe.php') $this->top_menu='eldy_backoffice.php';
// Object $mc
if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled))
{
global $mc;
$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
if ($ret)
{
$mc = new ActionsMulticompany($db);
$mc->setValues($this);
}
}
} }
} }