From: toyomoyo <toyomoyo>
Date: Tue, 18 Apr 2006 09:05:07 +0000 (+0000)
Subject: fix for 5204
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4e93938edb3e11a5b5e31bbef4315905d73734bd;p=moodle.git

fix for 5204
---

diff --git a/admin/utfdbmigrate.php b/admin/utfdbmigrate.php
index 5434f002b4..d71b7addd0 100755
--- a/admin/utfdbmigrate.php
+++ b/admin/utfdbmigrate.php
@@ -686,11 +686,18 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
     //remove the cache file!
     @unlink($CFG->dataroot.'/cache/languages');
 
+    // Regenerate some cached data
+    
+    if ($db->dbtype == 'mysql') {
+        $db->Execute("SET NAMES 'utf8'");
+    } else if ($db->dbtype == 'postgres7') {
+        $db->Execute("SET NAMES 'utf8'");
+    }
+    
+    rebuild_course_cache();
+
     //set the final flag
     migrate2utf8_set_config('unicodedb','true');    //this is the main flag for unicode db
-
-    // Regenerate some cached data
-    rebuild_course_cache();       
     
 }