Merge branch 'MDL-55374-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE

2016-08-01 13:50:40 +01:00
parent 55d3501159 50cb7da5f9
commit 32bc32736b
1 changed files with 3 additions and 2 deletions
@@ -119,7 +119,7 @@ EOD;
     */
    protected static function strip_images($html) {
        $dom = new DOMDocument();
-        $dom->loadHTML($html);
+        $dom->loadHTML("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" . $html);
        $images = $dom->getElementsByTagName('img');
        $i = 0;

@@ -135,7 +135,8 @@ EOD;
            $text = $dom->createTextNode($replacement);
            $node->parentNode->replaceChild($text, $node);
        }
-        return $dom->saveHTML();
+        $count = 1;
+        return str_replace("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>", "", $dom->saveHTML(), $count);
    }

    /**