Merge pull request #10763 from nextcloud/fix/noid/html5-and-network-a…

…ccess fix: html5 tag errors
nextcloud · Feb 27, 2025 · b507ee3 · b507ee3
2 parents 2d1b3b4 + fb4fae1
commit b507ee3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Service/MimeMessage.php b/lib/Service/MimeMessage.php
@@ -67,13 +67,13 @@ private function buildMessagePart(?string $contentPlain, ?string $contentHtml):
 
 			// determine if content is wrapped properly in a html tag, otherwise we need to wrap it properly
 			if (mb_strpos($contentHtml, '<html') === false) {
-				$source = '<html><meta http-equiv="content-type" content="text/html; charset=UTF-8"><body>' . $contentHtml . '</body>';
+				$source = '<!DOCTYPE html><html><meta http-equiv="content-type" content="text/html; charset=UTF-8"><body>' . PHP_EOL . $contentHtml . PHP_EOL . '</body>';
 			} else {
 				$source = ' ' . $contentHtml;
 			}
 
 			$doc = new DOMDocument();
-			$doc->loadHTML($source, LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
+			$doc->loadHTML($source, LIBXML_NONET | LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
 			// determine if content has any embedded images
 			$embeddedParts = [];
 			foreach ($doc->getElementsByTagName('img') as $id => $image) {