Fix: commit at wrong place

This commit is contained in:
Laurent Destailleur 2012-04-15 18:18:46 +02:00
parent 0f8156ebcf
commit ef79c1ba21

View File

@ -319,7 +319,7 @@ class Task extends CommonObject
$this->db->rollback(); $this->db->rollback();
return 0; return 0;
} }
//Delete associated link file //Delete associated link file
//retreive project ref to know project folder //retreive project ref to know project folder
$sql = "SELECT p.ref"; $sql = "SELECT p.ref";
@ -329,7 +329,7 @@ class Task extends CommonObject
dol_syslog(get_class($this)."::delete(retreive proj ref) sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::delete(retreive proj ref) sql=".$sql, LOG_DEBUG);
$resql_projref=$this->db->query($sql); $resql_projref=$this->db->query($sql);
if ($resql_projref) if ($resql_projref)
{ {
if ($this->db->num_rows($resql_projref)) if ($this->db->num_rows($resql_projref))
{ {
$obj = $this->db->fetch_object($resql_projref); $obj = $this->db->fetch_object($resql_projref);
@ -387,10 +387,8 @@ class Task extends CommonObject
} }
else else
{ {
$this->db->commit();
$this->db->free($resql); $this->db->free($resql);
//Delete associated link file //Delete associated link file
if ($conf->projet->dir_output) if ($conf->projet->dir_output)
{ {
@ -408,7 +406,9 @@ class Task extends CommonObject
} }
} }
} }
$this->db->commit();
return 1; return 1;
} }
} }