From d00ebb8de07e5d667106e2d4dec11a5fa2a0ffd5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Apr 2009 15:39:36 +0000 Subject: [PATCH] Fix: Fix another regression due to multicompany changements --- htdocs/core/conf.class.php | 5 +++-- htdocs/includes/modules/DolibarrModules.class.php | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index 2ef3d858f11..c7d2c646709 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -50,6 +50,8 @@ class Conf var $top_menu; var $left_menu; + var $entity=1; // By default + var $css_modules=array(); var $tabs_modules=array(); @@ -66,8 +68,7 @@ class Conf { dol_syslog("Conf::setValues"); - // Par defaut, a oui - $this->global->PRODUIT_CONFIRM_DELETE_LINE=1; + $this->global->PRODUIT_CONFIRM_DELETE_LINE=1; // Par defaut, a oui $this->entity = $entity; diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index 44d40b5fa18..714626899e5 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -394,9 +394,9 @@ class DolibarrModules $err = 0; - $sql = "DELETE FROM ".MAIN_DB_PREFIX."const "; - $sql.= "WHERE name = '".$this->const_name."' "; - $sql.= "AND entity = ".$conf->entity; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; + $sql.= " WHERE name = '".$this->const_name."'"; + $sql.= " AND entity = ".$conf->entity; dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG); $this->db->query($sql); @@ -422,9 +422,9 @@ class DolibarrModules $err = 0; - $sql = "DELETE FROM ".MAIN_DB_PREFIX."const "; - $sql.= "WHERE name = '".$this->const_name."'"; - $sql.= "AND entity = ".$conf->entity; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; + $sql.= " WHERE name = '".$this->const_name."'"; + $sql.= " AND entity = ".$conf->entity; dol_syslog("DolibarrModules::_unactive sql=".$sql); $this->db->query($sql);