Merge pull request #14346 from tomaski/master

MorrisJobke · web-flow · commit 407c7c2ad356 · 2019-02-26T14:41:23.000+01:00
fix(EMailTemplate): malformed HTML in some cases
diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php
@@ -435,6 +435,7 @@ public function addBodyText(string $text, $plainText = '') {
 			$text = htmlspecialchars($text);
 		}
 
+		$this->ensureBodyListClosed();
 		$this->ensureBodyIsOpened();
 
 		$this->htmlBody .= vsprintf($this->bodyText, [$text]);

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,7 @@ public function addBodyText(string $text, $plainText = '') {`
`435`	`435`	`$text = htmlspecialchars($text);`
`436`	`436`	`}`
`437`	`437`
	`438`	`+ $this->ensureBodyListClosed();`
`438`	`439`	`$this->ensureBodyIsOpened();`
`439`	`440`
`440`	`441`	`$this->htmlBody .= vsprintf($this->bodyText, [$text]);`