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

Work on PHP 8 compatibility

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-15 01:52:35 +02:00
parent f5ce54728d
commit 6b7de51d21
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,11 +358,12 @@ class Conf
if ($modulename == 'supplierproposal') { if ($modulename == 'supplierproposal') {
$modulename = 'supplier_proposal'; $modulename = 'supplier_proposal';
} }
$this->modules[$modulename] = $modulename; // Add this module in list of enabled modules
// deprecated
if (!isset($this->$modulename) || !is_object($this->$modulename)) { if (!isset($this->$modulename) || !is_object($this->$modulename)) {
$this->$modulename = new stdClass(); $this->$modulename = new stdClass();
} }
$this->$modulename->enabled = true; $this->$modulename->enabled = true;
$this->modules[] = $modulename; // Add this module in list of enabled modules
} }
} }
} }

4
htdocs/core/lib/functions.lib.php
View File

@ -166,7 +166,9 @@ function getDolUserInt($key, $default = 0, $tmpuser = null)
function isModEnabled($module) function isModEnabled($module)
{ {
global $conf; global $conf;
return !empty($conf->$module->enabled);
return !empty($conf->modules[$module]);
//return !empty($conf->$module->enabled);
} }
/** /**

2
htdocs/install/inc.php
View File

@ -323,6 +323,7 @@ if (!isset($conf->syslog) || !is_object($conf->syslog)) {
$conf->syslog = new stdClass(); $conf->syslog = new stdClass();
} }
$conf->syslog->enabled = 1; $conf->syslog->enabled = 1;
$conf->modules['syslog'] = 'syslog';
$conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG'); $conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
if (!defined('SYSLOG_HANDLERS')) { if (!defined('SYSLOG_HANDLERS')) {
define('SYSLOG_HANDLERS', '["mod_syslog_file"]'); define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
@ -435,6 +436,7 @@ function conf($dolibarr_main_document_root)
$conf->syslog = new stdClass(); $conf->syslog = new stdClass();
} }
$conf->syslog->enabled = 1; $conf->syslog->enabled = 1;
$conf->modules['syslog'] = 'syslog';
$conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG'); $conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
if (!defined('SYSLOG_HANDLERS')) { if (!defined('SYSLOG_HANDLERS')) {
define('SYSLOG_HANDLERS', '["mod_syslog_file"]'); define('SYSLOG_HANDLERS', '["mod_syslog_file"]');