extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

"prefer iconv for windows-874 and tis-620 (Thai) charsets, as they are not supported by mbstring"

Browse Source
This commit is contained in:
Ralf Becker 2010-05-11 15:47:02 +00:00
parent 8ed01db988
commit fc52dfa528
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/inc/class.translation.inc.php
View File

@ -435,6 +435,11 @@ class translation
case 'windows-1257':
$from = 'iso-8859-13';
break;
case 'windows-874':
case 'tis-620':
$prefer_iconv = true;
break;
}
if (!$to)
{
@ -452,9 +457,9 @@ class translation
{
return utf8_decode($data);
}
if ($this->mbstring && @mb_convert_encoding($data,$to,$from)!="")
if ($this->mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data,$to,$from)) != '')
{
return @mb_convert_encoding($data,$to,$from);
return $data;
}
if(function_exists('iconv'))
{
@ -480,7 +485,7 @@ class translation
// 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($from=='EUC-CN')
if($from == 'euc-cn')
{
$from='gb18030';
}