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

Fix: Bad error management making rollback instead of commit

Browse Source
This commit is contained in:
Laurent Destailleur 2014-01-23 09:19:15 +01:00
parent 82bc9e709b
commit 5cfaca4942
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/user/class/user.class.php
View File

@ -1007,12 +1007,15 @@ class User extends CommonObject
$this->db->begin(); $this->db->begin();
// Cree et positionne $this->id // Create and set $this->id
$result=$this->create($user); $result=$this->create($user);
if ($result > 0) if ($result > 0)
{ {
$result=$this->setPassword($user,$this->pass); $newpass=$this->setPassword($user,$this->pass);
if ($member->fk_soc) { if (is_numeric($newpass) && $newpass < 0) $result=-2;
if ($result > 0 && $member->fk_soc) // If member is linked to a thirdparty
{
$sql = "UPDATE ".MAIN_DB_PREFIX."user"; $sql = "UPDATE ".MAIN_DB_PREFIX."user";
$sql.= " SET fk_societe=".$member->fk_soc; $sql.= " SET fk_societe=".$member->fk_soc;
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
@ -1026,7 +1029,7 @@ class User extends CommonObject
} }
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->lasterror();
dol_syslog(get_class($this)."::create_from_member - 1 - ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create_from_member - 1 - ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
@ -1034,13 +1037,19 @@ class User extends CommonObject
} }
} }
} }
if ($result > 0)
{
$this->db->commit();
return $this->id;
}
else else
{ {
// $this->error deja positionne // $this->error deja positionne
dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return $result; return -2;
} }
} }