Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 03:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix confusion between ->childs and ->childsoncascade

Browse Source
This commit is contained in:
Laurent Destailleur
2019-06-22 20:17:40 +02:00
parent 71b266b5a8
commit b202c7eaa0
14 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/class/commonobject.class.php
View File

@@ -7490,7 +7490,7 @@ abstract class CommonObject
$this->db->begin();
if ($forcechilddeletion)
if ($forcechilddeletion) // Force also delete of childtables that should lock deletion in standard case when option force is off
{
foreach($this->childtables as $table)
{
@@ -7518,6 +7518,20 @@ abstract class CommonObject
}
}
// Delete cascade first
foreach($this->childtablesoncascade as $table)
{
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error=$this->db->lasterror();
$this->errors[]=$this->error;
$this->db->rollback();
return -1;
}
}
if (! $error) {
if (! $notrigger) {
// Call triggers