From: stronk7 <stronk7>
Date: Tue, 28 Mar 2006 19:22:35 +0000 (+0000)
Subject: Only decode from utf8 if we aren't running under utf8.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1f1e3288ca1afd9b60860182520fd59da54fa548;p=moodle.git

Only decode from utf8 if we aren't running under utf8.

Please test it. Thanks!
---

diff --git a/question/format/hotpot/format.php b/question/format/hotpot/format.php
index 3b24468ee2..0c2b2c9f7a 100644
--- a/question/format/hotpot/format.php
+++ b/question/format/hotpot/format.php
@@ -486,7 +486,9 @@ class hotpot_xml_tree {
         eval('$value = &$this->xml'.$this->xml_root.$tags.$more_tags.';');
 
         if (is_string($value)) {
-            $value = utf8_decode($value);
+            if (empty($CFG->unicodedb)) {
+                $value = utf8_decode($value);
+            }
 
             // decode angle brackets and ampersands
             $value = strtr($value, array('&#x003C;'=>'<', '&#x003E;'=>'>', '&#x0026;'=>'&'));