From f9f03d40e20900ebaa19bf3205f5a6be806c884b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@users.sourceforge.net> Date: Mon, 29 Jun 2009 13:49:06 +0000 Subject: [PATCH] Fix: conf class must not use a conf class (it can use itself however). --- htdocs/core/conf.class.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index e991011ec8c..e34f411e63b 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -76,8 +76,6 @@ class Conf */ function setValues($db) { - global $conf; - dol_syslog("Conf::setValues"); /* @@ -85,8 +83,8 @@ class Conf * - En constante php (TODO a virer) * - 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.= ",".$db->decrypt('value',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." as value, entity"; + $sql = "SELECT ".$db->decrypt('name',$this->db->dolibarr_main_db_encryption,$this->db->dolibarr_main_db_cryptkey)." as name"; + $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.= " WHERE entity IN (0,".$this->entity.")"; -- GitLab