Fix delete linked files for ticket and Don (#29929)
This commit is contained in:
parent
f40a1bd3b1
commit
53f8b7693e
2 changed files with 23 additions and 1 deletions
|
|
@ -604,6 +604,17 @@ class Don extends CommonObject
|
|||
if (!$resql) {
|
||||
$this->errors[] = $this->db->lasterror();
|
||||
$error++;
|
||||
} else {
|
||||
// we delete file with dol_delete_dir_recursive
|
||||
$this->deleteEcmFiles(1);
|
||||
|
||||
$dir = DOL_DATA_ROOT.'/'.$this->element.'/'.$this->ref;
|
||||
// For remove dir
|
||||
if (dol_is_dir($dir)) {
|
||||
if (!dol_delete_dir_recursive($dir)) {
|
||||
$this->errors[] = $this->error;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1221,6 +1221,17 @@ class Ticket extends CommonObject
|
|||
if (!$resql) {
|
||||
$error++;
|
||||
$this->errors[] = "Error ".$this->db->lasterror();
|
||||
} else {
|
||||
// we delete file with dol_delete_dir_recursive
|
||||
$this->deleteEcmFiles(1);
|
||||
|
||||
$dir = DOL_DATA_ROOT.'/'.$this->element.'/'.$this->ref;
|
||||
// For remove dir
|
||||
if (dol_is_dir($dir)) {
|
||||
if (!dol_delete_dir_recursive($dir)) {
|
||||
$this->errors[] = $this->error;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2932,7 +2943,7 @@ class Ticket extends CommonObject
|
|||
|
||||
if (!empty($object->origin_replyto)) {
|
||||
$sendto[$object->origin_replyto] = $object->origin_replyto;
|
||||
} else if (!empty($object->origin_email)) {
|
||||
} elseif (!empty($object->origin_email)) {
|
||||
$sendto[$object->origin_email] = $object->origin_email;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue