Warning and notice fixed

2018-12-29 09:53:31 +00:00
parent 16f58c8982
commit fd6c64f9c1
2 changed files with 8 additions and 1 deletions
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -180,7 +180,9 @@ class HTML
 		$xpath = new DomXPath($doc);
 		$list = $xpath->query("//pre");
 		foreach ($list as $node) {
-			$node->nodeValue = str_replace("\n", "\r", $node->nodeValue);
+			// Ensure to escape unescaped & - they will otherwise raise a warning
+			$safe_value = preg_replace('/&(?!\w+;)/', '&amp;', $node->nodeValue);
+			$node->nodeValue = str_replace("\n", "\r", $safe_value);
 		}

 		$message = $doc->saveHTML();