summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-03-21 12:47:11 +0000
committerthomascube <thomas@roundcube.net>2008-03-21 12:47:11 +0000
commit7250d6363cdce1ffd9ad8a41605fee6912719dcd (patch)
treeb4edfd62484eb2d06924f57f0a3c6edf7fc138ad /program
parent52f8caf7706cbdd6087ac9c555270604554db5ef (diff)
GB2312 alias is for iconv only (fixes #1484818)
Diffstat (limited to 'program')
-rw-r--r--program/include/main.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index e2005e7f9..3bbc5f21e 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -959,12 +959,12 @@ function rcube_charset_convert($str, $from, $to=NULL)
'X-USER-DEFINED' => 'ISO-8859-15',
'ISO-8859-8-I' => 'ISO-8859-8',
'KS_C_5601-1987' => 'EUC-KR',
- 'GB2312' => 'GB18030'
);
// convert charset using iconv module
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);
}