From e198cca75bc5f6bc573174739780e18b4c6a7daa Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 6 Oct 2013 15:59:28 +0400 Subject: Revert "sanitize: remove doctype properly, add experimental workaround against unnecessary html elements in sanitized data" This reverts commit f44d59992edac23206f593e240f0e445c571b661. --- include/functions.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'include/functions.php') diff --git a/include/functions.php b/include/functions.php index 92c37ae10..040140bbf 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2892,7 +2892,7 @@ } } - $doc->removeChild($doc->doctype); //remove doctype + $doc->removeChild($doc->firstChild); //remove doctype $doc = strip_harmful_tags($doc, $allowed_elements, $disallowed_attributes); if ($highlight_words) { @@ -2925,19 +2925,7 @@ } } - $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(); - } + $res = $doc->saveHTML(); return $res; } -- cgit v1.2.3