Fix convert code blocs from markdown/html to bbcode

1 files changed, 9 insertions, 2 deletions

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 5cb153a77..f75a3e428 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -127,8 +127,15 @@ function html2bbcode($message)
 
 	$xpath = new DomXPath($doc);
 	$list = $xpath->query("//pre");
-	foreach ($list as $node)
-		$node->nodeValue = str_replace("\n", "\r", $node->nodeValue);
+	foreach ($list as $node) {
+		if ($node->hasChildNodes()) {
+			foreach ($node->childNodes as $child) {
+				$child->nodeValue = str_replace("\n", "\r", $child->nodeValue);
+			}
+		} else {
+			$node->nodeValue = str_replace("\n", "\r", $node->nodeValue);
+		}
+	}
 
 	$message = $doc->saveHTML();
 	$message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "<br />", " ", ""), $message);