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

Fix: conf class must not use a conf class (it can use itself however).

Browse Source
This commit is contained in:
Laurent Destailleur 2009-06-29 13:49:06 +00:00
parent 1ef95b0bbc
commit f9f03d40e2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,6 @@ class Conf
*/ */
function setValues($db) function setValues($db)
{ {
global $conf;
dol_syslog("Conf::setValues"); dol_syslog("Conf::setValues");
/* /*
@ -85,8 +83,8 @@ class Conf
* - En constante php (TODO a virer) * - En constante php (TODO a virer)
* - En $this->global->key=value * - En $this->global->key=value
*/ */
$sql = "SELECT ".$db->decrypt('name',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." as name"; $sql = "SELECT ".$db->decrypt('name',$this->db->dolibarr_main_db_encryption,$this->db->dolibarr_main_db_cryptkey)." as name";
$sql.= ",".$db->decrypt('value',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." as value, entity"; $sql.= ",".$db->decrypt('value',$this->db->dolibarr_main_db_encryption,$this->db->dolibarr_main_db_cryptkey)." as value, entity";
$sql.= " FROM ".MAIN_DB_PREFIX."const"; $sql.= " FROM ".MAIN_DB_PREFIX."const";
$sql.= " WHERE entity IN (0,".$this->entity.")"; $sql.= " WHERE entity IN (0,".$this->entity.")";