Added more common mail charsets to choose from bug 5229

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 400434dbd8a21996cbf215f5148f401676510bb1..f6185da123c515d8541290612d46653e034bb2f0 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -5044,6 +5044,8 @@ function get_list_of_charsets() {
         'ISO-2022-JP'=> 'ISO-2022-JP',
         'ISO-8859-1' => 'ISO-8859-1',
         'SHIFT-JIS'  => 'SHIFT-JIS',
+        'GB2312'     => 'GB2312',
+        'GB18030'    => 'GB18030',
         'UTF-8'      => 'UTF-8');
 
     asort($charsets);