Merged XML UTF-8 fixed from stable (see bug 1927)

diff --git a/backup/restorelib.php b/backup/restorelib.php
index c6b28ff74995d89e90e5b06ade81a257347b00a2..6aabae33105059035e5128880237985cd609ce4d 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -2964,7 +2964,7 @@
         
         $status = true;
 
-        $xml_parser = xml_parser_create();
+        $xml_parser = xml_parser_create('UTF-8');
         $moodle_parser = new MoodleParser();
         $moodle_parser->todo = $todo;
         $moodle_parser->preferences = $preferences;

diff --git a/filter/multilang/filter.php b/filter/multilang/filter.php
index c736e460ac029204b996374323e1d6af4e20295f..440caa63352d6f2db5c12846a19876d15e99d1d3 100644 (file)
--- a/filter/multilang/filter.php
+++ b/filter/multilang/filter.php
@@ -103,7 +103,7 @@ class XMLParser {
     $this->texts['en'] = $data;\r
 \r
     /// Create parser\r
-    $xml_parser = xml_parser_create(); \r
+    $xml_parser = xml_parser_create('UTF-8'); \r
     xml_set_object($xml_parser, &$this); \r
     xml_set_element_handler($xml_parser, 'startElement', 'endElement'); \r
     xml_set_character_data_handler($xml_parser, 'characterData'); \r

diff --git a/lib/xmlize.php b/lib/xmlize.php
index 3bffc6a039787e685e26c19026708abfc1e8be74..db9df078547cf0e5da618b7994adf1d758036bbf 100644 (file)
--- a/lib/xmlize.php
+++ b/lib/xmlize.php
@@ -20,11 +20,11 @@
  *
  */
 
-function xmlize($data, $WHITE=1) {
+function xmlize($data, $WHITE=1, $encoding='UTF-8') {
 
     $data = trim($data);
     $vals = $index = $array = array();
-    $parser = xml_parser_create();
+    $parser = xml_parser_create($encoding);
     xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
     xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, $WHITE);
     xml_parse_into_struct($parser, $data, $vals, $index);

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 403f716accffa2d8e3ef5b165fc32ed4fea162cd..060e784554364bbfdea98e110a28ebfad3f61db7 100755 (executable)
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -479,7 +479,7 @@ function scorm_parse($basedir,$file,$scorm_id) {
     $level = 0;
     $parent[$level] = '/';
 
-    $xml_parser = xml_parser_create();
+    $xml_parser = xml_parser_create('UTF-8');
     // use case-folding so we are sure to find the tag in $map_array
     xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, true);
     xml_set_element_handler($xml_parser, 'scorm_startElement', 'scorm_endElement');