patch [ 962307 ] Chinese charset conversion patch

"I am alost certain this is the best solution. I just
commited the change, please close this patch.

This is a typical problem (GB2312~GB18030) that many
opensource/commercial mailers fail to handle."
This commit is contained in:
zhangweiwu 2004-05-29 01:14:29 +00:00
parent 911bfdae1a
commit 1f799dd84d

View File

@ -322,6 +322,12 @@
} }
if(function_exists('iconv')) if(function_exists('iconv'))
{ {
if($from=='EUC-CN') $from='gb18030';
// the above is to workaround patch #962307
// if using EUC-CN, for iconv it strickly follow GB2312 and fail
// in an email on the first Traditional/Japanese/Korean character,
// but in reality when people send mails in GB2312, UMA mostly use
// extended GB13000/GB18030 which allow T/Jap/Korean characters.
if (($data = iconv($from,$to,$data))) if (($data = iconv($from,$to,$data)))
{ {
return $data; return $data;