Fix: [ bug #501 ] Error while trying to modify an user

This commit is contained in:
Regis Houssin 2012-08-18 10:16:25 +02:00
parent eeb52eee0d
commit 4aa8d0eb0c

View File

@ -717,36 +717,43 @@ class Adherent extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid; // Remove linked user
dol_syslog(get_class($this)."::delete sql=".$sql); $ret=$this->setUserId(0);
$resql=$this->db->query($sql); if ($ret > 0)
if ($resql) {
{ $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid;
if ($this->db->affected_rows($resql)) dol_syslog(get_class($this)."::delete sql=".$sql);
{ $resql=$this->db->query($sql);
// Appel des triggers if ($resql)
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); {
$interface=new Interfaces($this->db); if ($this->db->affected_rows($resql))
$result=$interface->run_triggers('MEMBER_DELETE',$this,$user,$langs,$conf); {
if ($result < 0) { $error++; $this->errors=$interface->errors; } // Appel des triggers
// Fin appel triggers include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$this->db->commit(); $result=$interface->run_triggers('MEMBER_DELETE',$this,$user,$langs,$conf);
return 1; if ($result < 0) {
} $error++; $this->errors=$interface->errors;
else }
{ // Fin appel triggers
// Rien a effacer
$this->db->rollback(); $this->db->commit();
return 0; return 1;
} }
} else
else {
{ // Rien a effacer
$this->error=$this->db->error(); $this->db->rollback();
$this->db->rollback(); return 0;
return -3; }
} }
else
{
$this->error=$this->db->error();
$this->db->rollback();
return -3;
}
}
} }
else else
{ {