From 91bf93a668a4bb23c6f83a3a53841dddcdf6a02b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Jul 2009 13:51:17 +0000 Subject: [PATCH] Fix: Disable of logging was broken some times. --- htdocs/includes/modules/DolibarrModules.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index bcd40ff2078..e4b667c17b8 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -356,7 +356,7 @@ class DolibarrModules $sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules"; $sql.= " WHERE numero = ".$this->numero; - $sql.= " AND entity = ".$conf->entity; + $sql.= " AND entity in (0, ".$conf->entity.")"; dol_syslog("DolibarrModules::_dbunactive sql=".$sql, LOG_DEBUG); $this->db->query($sql); @@ -376,11 +376,11 @@ class DolibarrModules $err = 0; // Common module - $entity = ((isset($this->always_enabled)||isset($this->core_enabled)) ? 0 : $conf->entity); + $entity = ((! empty($this->always_enabled) || ! empty($this->core_enabled)) ? 0 : $conf->entity); $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; $sql.= " WHERE ".$this->db->decrypt('name',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." = '".$this->const_name."'"; - $sql.= " AND entity = ".$entity; + $sql.= " AND entity in (0, ".$entity.")"; dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG); $this->db->query($sql); @@ -411,11 +411,11 @@ class DolibarrModules $err = 0; // Common module - $entity = (isset($this->core_enabled) ? 0 : $conf->entity); + $entity = ((! empty($this->always_enabled) || ! empty($this->core_enabled)) ? 0 : $conf->entity); $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; $sql.= " WHERE ".$this->db->decrypt('name',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." = '".$this->const_name."'"; - $sql.= " AND entity = ".$entity; + $sql.= " AND entity in (0, ".$entity.")"; dol_syslog("DolibarrModules::_unactive sql=".$sql); $this->db->query($sql);