Changeset 1198 in subversion for trunk/roundcubemail/program/include/main.inc

Timestamp:

Mar 21, 2008 8:47:11 AM (5 years ago)

Author:

thomasb

Message:

GB2312 alias is for iconv only (fixes #1484818)

File:

• trunk/roundcubemail/program/include/main.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -960 +960 @@
     'ISO-8859-8-I'   => 'ISO-8859-8',
     'KS_C_5601-1987' => 'EUC-KR',
-    'GB2312'         => 'GB18030'
   );
 
@@ -966 +965 @@
   if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7')
     {
+    $aliases['GB2312'] = 'GB18030';
     return iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
     }