diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php index dd05a320ec89f13f69c88b267eb1457df4f1fe9c..5665dc452f17feb765a48d60ed3f845e366886fd 100644 --- a/Classes/Service/MailTemplateService.php +++ b/Classes/Service/MailTemplateService.php @@ -244,11 +244,11 @@ class MailTemplateService { $emailView->assignMultiple($this->markers); $emailBody = $emailView->render(); - if ($this->ignoreMailQueue) { - // insert <br /> tags, but replace every instance of three or more successive breaks with just two. - $emailBody = nl2br($emailBody); - $emailBody = preg_replace('/(<br[\s]?[\/]?>[\s]*){3,}/', '<br /><br />', $emailBody); + // insert <br /> tags, but replace every instance of three or more successive breaks with just two. + $emailBody = nl2br($emailBody); + $emailBody = preg_replace('/(<br[\s]?[\/]?>[\s]*){3,}/', '<br /><br />', $emailBody); + if ($this->ignoreMailQueue) { $this->mailMessage->setBody($emailBody, 'text/html'); $this->mailMessage->send(); } else { @@ -263,18 +263,12 @@ class MailTemplateService { * * @param string $emailBody * @param int $priority - * @param int $pid */ - private function addMailToMailQueue($emailBody, $priority, $pid = 0) { + private function addMailToMailQueue($emailBody, $priority) { /** @var ObjectManager $objectManager */ $objectManager = GeneralUtility::makeInstance(ObjectManager::class); - if ($pid <= 0 && isset($GLOBALS['TSFE'])) { - $pid = (int) $GLOBALS['TSFE']->id; - } - $mail = $objectManager->get(Mail::class); - $mail->setPid($pid); $mail->setFromAddress($this->fromAddress); $mail->setToAddress($this->toAddresses); $mail->setMailSubject($this->subject);