merged fix for a problem where globallang is not respected in user table

diff --git a/lib/db/migrate2utf8.php b/lib/db/migrate2utf8.php
index 19a8e5e5c9e7f7121b0a9b2ad22dbd10d6de01c1..8e32183660754c5ca3c984c3a2b98f274205ba9b 100755 (executable)
--- a/lib/db/migrate2utf8.php
+++ b/lib/db/migrate2utf8.php
@@ -3,7 +3,7 @@
 
 function migrate2utf8_user($fields, $crash, $debug, $maxrecords) {
 
-    global $CFG, $db, $processedrecords;
+    global $CFG, $db, $processedrecords, $globallang;
 
     // convert all columns to blobs
     foreach ($fields as $field) {
@@ -74,7 +74,11 @@ function migrate2utf8_user($fields, $crash, $debug, $maxrecords) {
                 update_record('config',$migrationconfig);
                 
                 // this is the only encoding we need for this table
-                $fromenc = get_original_encoding('','',$record->lang);
+                if ($globallang) {
+                               $fromenc = $globallang;
+                       } else {
+                       $fromenc = get_original_encoding('','',$record->lang);
+                }
 
                 if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
                     foreach ($fields as $field) {