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

Merge pull request #17962 from atm-lena/12.0_FIX_AddTrigger_MailingDelete

Browse Source 
12.0 fix add trigger mailing delete
This commit is contained in:
Laurent Destailleur 2021-06-17 13:35:01 +02:00 committed by GitHub
commit 96da2a6a37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/comm/mailing/class/mailing.class.php
View File

@ -427,8 +427,12 @@ class Mailing extends CommonObject
* @param int $rowid id du mailing a supprimer * @param int $rowid id du mailing a supprimer
* @return int 1 en cas de succes * @return int 1 en cas de succes
*/ */
public function delete($rowid) public function delete($rowid, $notrigger = 0)
{ {
global $user;
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing";
$sql .= " WHERE rowid = ".$rowid; $sql .= " WHERE rowid = ".$rowid;
@ -436,14 +440,32 @@ class Mailing extends CommonObject
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
return $this->delete_targets(); $res = $this->delete_targets();
} if(empty($res)){
else $this->db->rollback();
{
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
return -1; return -1;
} }
} }
else
{
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
}
if(!$notrigger){
$result = $this->call_trigger('MAILING_DELETE', $user);
if ($result < 0)
{
$this->db->rollback();
return -1;
}
}
$this->db->commit();
return 1;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**