sanitize: remove doctype properly, add experimental workaround against unnecessary...

diff --git a/include/functions.php b/include/functions.php
index e9b1270fb6eff60a994170bb919982b6da168493..c6ee6dfbdbeaa84134db28b0876ad0c230ef2dd7 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -2891,7 +2891,7 @@
                        }
                }
 
-               $doc->removeChild($doc->firstChild); //remove doctype
+               $doc->removeChild($doc->doctype); //remove doctype
                $doc = strip_harmful_tags($doc, $allowed_elements, $disallowed_attributes);
 
                if ($highlight_words) {
@@ -2924,7 +2924,19 @@
                        }
                }
 
-               $res = $doc->saveHTML();
+               $body = $doc->getElementsByTagName("body")->item(0);
+
+               if ($body) {
+                       $div = $doc->createElement("div");
+
+                       foreach ($body->childNodes as $child) {
+                               $div->appendChild($child);
+                       }
+
+                       $res = $doc->saveXML($div);
+               } else {
+                       $res = $doc->saveHTML();
+               }
 
                return $res;
        }