Change place of deleteobjectlinked in deletecommon function
This commit is contained in:
parent
67c64f7505
commit
eff01374b1
@ -9455,6 +9455,12 @@ abstract class CommonObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Delete linked object
|
||||||
|
$res = $this->deleteObjectLinked();
|
||||||
|
if ($res < 0) {
|
||||||
|
$error++;
|
||||||
|
}
|
||||||
|
|
||||||
if (!$error && !empty($this->isextrafieldmanaged)) {
|
if (!$error && !empty($this->isextrafieldmanaged)) {
|
||||||
$result = $this->deleteExtraFields();
|
$result = $this->deleteExtraFields();
|
||||||
if ($result < 0) {
|
if ($result < 0) {
|
||||||
@ -9472,12 +9478,6 @@ abstract class CommonObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete linked object
|
|
||||||
$res = $this->deleteObjectLinked();
|
|
||||||
if ($res < 0) {
|
|
||||||
$error++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Commit or rollback
|
// Commit or rollback
|
||||||
if ($error) {
|
if ($error) {
|
||||||
$this->db->rollback();
|
$this->db->rollback();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user