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

Fix load of conf when using alternative $db

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-26 01:46:14 +02:00
parent 12d591b848
commit 2fd47615eb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,7 +173,7 @@ class Conf
{ {
dol_syslog(get_class($this)."::setValues"); dol_syslog(get_class($this)."::setValues");
if (!defined('NOREQUIREDB')) { if (!is_null($db) && is_object($db)) {
// Define all global constants into $this->global->key=value // Define all global constants into $this->global->key=value
$sql = "SELECT ".$db->decrypt('name')." as name,"; $sql = "SELECT ".$db->decrypt('name')." as name,";
$sql .= " ".$db->decrypt('value')." as value, entity"; $sql .= " ".$db->decrypt('value')." as value, entity";

1
htdocs/master.inc.php
View File

@ -133,6 +133,7 @@ if (!defined('NOREQUIRETRAN')) {
/* /*
* Object $db * Object $db
*/ */
$db = null;
if (!defined('NOREQUIREDB')) { if (!defined('NOREQUIREDB')) {
$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);