1
0
mirror of https://github.com/moodle/moodle.git synced 2025-06-12 19:12:12 +02:00

MDL-55374 mod_assign: Force utf-8 for DOMDocument

This prevents charset issues on some sites.
This commit is contained in:
Damyon Wiese
2016-07-29 10:43:25 +08:00
parent 90a8bdbfc0
commit fca211bf05

@ -119,7 +119,7 @@ EOD;
*/ */
protected static function strip_images($html) { protected static function strip_images($html) {
$dom = new DOMDocument(); $dom = new DOMDocument();
$dom->loadHTML($html); $dom->loadHTML("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" . $html);
$images = $dom->getElementsByTagName('img'); $images = $dom->getElementsByTagName('img');
$i = 0; $i = 0;
@ -135,7 +135,8 @@ EOD;
$text = $dom->createTextNode($replacement); $text = $dom->createTextNode($replacement);
$node->parentNode->replaceChild($text, $node); $node->parentNode->replaceChild($text, $node);
} }
return $dom->saveHTML(); $count = 1;
return str_replace("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>", "", $dom->saveHTML(), $count);
} }
/** /**