From 7250d6363cdce1ffd9ad8a41605fee6912719dcd Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 21 Mar 2008 08:47:11 -0400
Subject: [PATCH] GB2312 alias is for iconv only (fixes #1484818)
---
program/include/main.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index e2005e7..3bbc5f2 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -959,12 +959,12 @@
'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);
}
--
Gitblit v1.9.1