From: moodler <moodler>
Date: Thu, 20 Apr 2006 08:21:58 +0000 (+0000)
Subject: Added more common mail charsets to choose from    bug 5229
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=08bdcd3974d90de505585e33468e57904d2f0665;p=moodle.git

Added more common mail charsets to choose from    bug 5229
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 400434dbd8..f6185da123 100644
--- 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);