MDL-6196 minor related cleanup - should not be needed to backport it; merged from...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 8cf231509392f87f690bbb0ed494ee880fe0a7a2..b6009b1fbe5bf5109af9f107ba55e3f6d45c316b 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3403,7 +3403,11 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
             }
         }
     /// If it has changed, convert all the necessary strings
-        if ($mail->CharSet != $charset) {
+        $charset = strtolower($charset);
+        $charsets = get_list_of_charsets();
+        unset($charsets['UTF-8']);
+        $charsets = array_map('strtolower', $charsets);
+        if (in_array($charset, $charsets)) {
         /// Save the new mail charset
             $mail->CharSet = $charset;
         /// And convert some strings
@@ -4574,7 +4578,7 @@ function get_list_of_charsets() {
         'ISO-8859-1' => 'ISO-8859-1',
         'SHIFT-JIS'  => 'SHIFT-JIS',
         'GB2312'     => 'GB2312',
-        'GB18030'    => 'GB18030',
+        'GB18030'    => 'GB18030', // gb18030 not supported by typo and mbstring
         'UTF-8'      => 'UTF-8');
 
     asort($charsets);