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

FIX php8 compatibility

Browse Source
This commit is contained in:
Philippe GRAND 2022-08-28 13:52:48 +02:00
parent 9d188a5c96
commit b43527de8f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,7 @@ class Conf
} }
// Object $mc // Object $mc
if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) { if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {
global $mc; global $mc;
$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php'); $ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
if ($ret) { if ($ret) {
@ -425,7 +425,7 @@ class Conf
$rootfordata = DOL_DATA_ROOT; $rootfordata = DOL_DATA_ROOT;
$rootforuser = DOL_DATA_ROOT; $rootforuser = DOL_DATA_ROOT;
// If multicompany module is enabled, we redefine the root of data // If multicompany module is enabled, we redefine the root of data
if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1) { if (isModEnabled('multicompany') && !empty($this->entity) && $this->entity > 1) {
$rootfordata .= '/'.$this->entity; $rootfordata .= '/'.$this->entity;
} }
// Set standard temporary folder name or global override // Set standard temporary folder name or global override
@ -987,7 +987,7 @@ class Conf
} }
// Object $mc // Object $mc
if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) { if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {
if (is_object($mc)) { if (is_object($mc)) {
$mc->setValues($this); $mc->setValues($this);
} }