From b797605898d6ac69398eb15cce7ddac7db67f0d8 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 13 Sep 2004 08:17:09 +0000
Subject: [PATCH] Merged XML UTF-8 fixed from stable (see bug 1927)

---
 backup/restorelib.php       | 2 +-
 filter/multilang/filter.php | 2 +-
 lib/xmlize.php              | 4 ++--
 mod/scorm/lib.php           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backup/restorelib.php b/backup/restorelib.php
index c6b28ff749..6aabae3310 100644
--- 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 c736e460ac..440caa6335 100644
--- a/filter/multilang/filter.php
+++ b/filter/multilang/filter.php
@@ -103,7 +103,7 @@ class XMLParser {
     $this->texts['en'] = $data;
 
     /// Create parser
-    $xml_parser = xml_parser_create(); 
+    $xml_parser = xml_parser_create('UTF-8'); 
     xml_set_object($xml_parser, &$this); 
     xml_set_element_handler($xml_parser, 'startElement', 'endElement'); 
     xml_set_character_data_handler($xml_parser, 'characterData'); 
diff --git a/lib/xmlize.php b/lib/xmlize.php
index 3bffc6a039..db9df07854 100644
--- 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 403f716acc..060e784554 100755
--- 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');
-- 
2.39.5