Merge branch 'bugfix_347-NewLinesInMailLayouts' into 'master'

[BUGFIX] replace newlines in mail layout too See merge request !28

Merge branch 'bugfix_347-NewLinesInMailLayouts' into 'master'
[BUGFIX] replace newlines in mail layout too See merge request !28
5b9ee9f1 · Kevin von Spiczak · bb6c3845 · 3614c95a · 5b9ee9f1
Commit 5b9ee9f1 authored Jun 25, 2020 by Kevin von Spiczak
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -944,10 +944,7 @@ class MailTemplateService {
 			empty($overwrittenEmailBody) ? $templateContent : $overwrittenEmailBody
 		);

-		// insert <br> tags, but replace every instance of three or more successive breaks with just two.
 		$emailBody = $emailView->render();
-		$emailBody = \nl2br($emailBody);
-		$emailBody = \preg_replace('/(<br[\s]?[\/]?>[\s]*){3,}/', '<br><br>', $emailBody);

 		$layout = $this->getLayoutSource($layoutId, $siteRootId);
 		$emailHTMLHead = '';
@@ -955,6 +952,10 @@ class MailTemplateService {
 			$emailHTMLHead = $layout->getHeadContent();
 			$emailBody = \str_replace('###CONTENT###', $emailBody, $layout->getContent());
 		}
+
+		// 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);
 		$this->mailBodyToSend = '<html><head>' . $emailHTMLHead . '</head><body>' . $emailBody . '</body></html>';
 	}