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

Fix: Disable of logging was broken some times.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-07-08 13:51:17 +00:00
parent 451144e261
commit 91bf93a668
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -356,7 +356,7 @@ class DolibarrModules
$sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules";
$sql.= " WHERE numero = ".$this->numero; $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); dol_syslog("DolibarrModules::_dbunactive sql=".$sql, LOG_DEBUG);
$this->db->query($sql); $this->db->query($sql);
@ -376,11 +376,11 @@ class DolibarrModules
$err = 0; $err = 0;
// Common module // 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 = "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.= " 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); dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG);
$this->db->query($sql); $this->db->query($sql);
@ -411,11 +411,11 @@ class DolibarrModules
$err = 0; $err = 0;
// Common module // 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 = "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.= " 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); dol_syslog("DolibarrModules::_unactive sql=".$sql);
$this->db->query($sql); $this->db->query($sql);