merged fix for 5748

diff --git a/blocks/db/migrate2utf8.php b/blocks/db/migrate2utf8.php
index 5e097f038d73b5dfd2e5fbbe446eb0401ebf393d..a19c5b423ec56b2f611b990f7080c35fa3d67d7f 100755 (executable)
--- a/blocks/db/migrate2utf8.php
+++ b/blocks/db/migrate2utf8.php
@@ -61,6 +61,35 @@ function migrate2utf8_block_instance_configdata($recordid){
 
         return $blah;
 
+    } else if ($blocktype -> name == 'glossary_random'){
+
+        ///find course
+        if ($globallang) {
+            $fromenc = $globallang;
+        } else {
+            $sitelang   = $CFG->lang;
+            $courselang = get_course_lang($blockinstance->pageid);  //Non existing!
+            $userlang   = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
+
+            $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
+        }
+
+        $blah = unserialize(base64_decode($blockinstance->configdata));
+
+    /// We are going to use textlib facilities
+
+    /// Convert the text
+        $blah->title = utfconvert($blah->title, $fromenc, false);
+        $blah->addentry = utfconvert($blah->addentry, $fromenc, false);
+        $blah->viewglossary = utfconvert($blah->viewglossary, $fromenc, false);
+        $blah->invisible = utfconvert($blah->invisible, $fromenc, false);
+
+        $blockinstance->configdata = base64_encode(serialize($blah));
+
+        migrate2utf8_update_record('block_instance',$blockinstance);
+
+        return $blah;
+
     }
 
 }
@@ -127,6 +156,35 @@ global $CFG, $globallang;
 
         return $blah;
 
+    } else if ($blocktype -> name == 'glossary_random'){
+
+        ///find course
+        if ($globallang) {
+            $fromenc = $globallang;
+        } else {
+            $sitelang   = $CFG->lang;
+            $courselang = get_course_lang($blockpinned->pageid);  //Non existing!
+            $userlang   = get_main_teacher_lang($blockpinned->pageid); //N.E.!!
+
+            $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
+        }
+
+        $blah = unserialize(base64_decode($blockpinned->configdata));
+
+    /// We are going to use textlib facilities
+
+    /// Convert the text
+        $blah->title = utfconvert($blah->title, $fromenc, false);
+        $blah->addentry = utfconvert($blah->addentry, $fromenc, false);
+        $blah->viewglossary = utfconvert($blah->viewglossary, $fromenc, false);
+        $blah->invisible = utfconvert($blah->invisible, $fromenc, false);
+
+        $blockinstance->configdata = base64_encode(serialize($blah));
+
+        migrate2utf8_update_record('block_instance',$blockinstance);
+
+        return $blah;
+
     }
 }
 ?>