From: stronk7 <stronk7>
Date: Sat, 24 Apr 2004 00:48:57 +0000 (+0000)
Subject: Now encoding some fields to be non-ASCII aware. Thanks to Petr Skoda.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=9b690d2b4813f23759ce6569aa989e1f9749d60f;p=moodle.git

Now encoding some fields to be non-ASCII aware. Thanks to Petr Skoda.
See bug 1266 (http://moodle.org/bugs/bug.php?op=show&bugid=1266&pos=14).
Applied the same patch to alias too!!
---

diff --git a/mod/glossary/import.php b/mod/glossary/import.php
index a273d94579..717e7e9e96 100644
--- a/mod/glossary/import.php
+++ b/mod/glossary/import.php
@@ -208,7 +208,7 @@
                         unset($newalias);
         
                         $newalias->entryid = $newentry->id;
-                        $newalias->alias = $xmlalias['#']['NAME'][0]['#'];
+                        $newalias->alias = addslashes(utf8_decode($xmlalias['#']['NAME'][0]['#']));
                         $newalias->id = insert_record("glossary_alias",$newalias);
                     }
 
@@ -219,7 +219,7 @@
                             $xmlcat = $xmlcats[$k];
                             unset($newcat);
         
-                            $newcat->name = $xmlcat['#']['NAME'][0]['#'];
+                            $newcat->name = addslashes(utf8_decode($xmlcat['#']['NAME'][0]['#']));
                             $newcat->usedynalink = $xmlcat['#']['USEDYNALINK'][0]['#'];
                             if ( !$category = get_record("glossary_categories","glossaryid",$glossary->id,"name",$newcat->name) ) {
                                 // Create the category if it does not exist
@@ -315,4 +315,4 @@
 /// Finish the page
     print_footer($course);
 
-?>
\ No newline at end of file
+?>