Skip to content
Snippets Groups Projects
Commit b8edd213 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Fixing logic error with blacklist when sending mails directly

parent 77b8172b
No related branches found
No related tags found
1 merge request!6Feature 4 3
...@@ -341,10 +341,9 @@ class MailTemplateService { ...@@ -341,10 +341,9 @@ class MailTemplateService {
// insert <br /> tags, but replace every instance of three or more successive breaks with just two. // insert <br /> tags, but replace every instance of three or more successive breaks with just two.
$emailBody = nl2br($emailBody); $emailBody = nl2br($emailBody);
$emailBody = preg_replace('/(<br[\s]?[\/]?>[\s]*){3,}/', '<br /><br />', $emailBody); $emailBody = preg_replace('/(<br[\s]?[\/]?>[\s]*){3,}/', '<br /><br />', $emailBody);
if ($this->ignoreMailQueue && self::isTemplateBlacklisted( if ($this->ignoreMailQueue && !self::isTemplateBlacklisted(
$this->extensionKey, $this->templateName, $siteRootId $this->extensionKey, $this->templateName, $siteRootId
)) { )) {
$this->mailMessage->setBody($emailBody, 'text/html'); $this->mailMessage->setBody($emailBody, 'text/html');
$this->mailMessage->send(); $this->mailMessage->send();
$dateTime = new DateTime(); $dateTime = new DateTime();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment