Skip to content
Snippets Groups Projects
Commit f9f03d40 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

parent 1ef95b0b
No related branches found
No related tags found
No related merge requests found
......@@ -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.")";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment