|
|
@ -671,12 +671,12 @@ class rcube_charset
|
|
|
|
// FIXME: the order is important, because sometimes
|
|
|
|
// FIXME: the order is important, because sometimes
|
|
|
|
// iso string is detected as euc-jp and etc.
|
|
|
|
// iso string is detected as euc-jp and etc.
|
|
|
|
$enc = array(
|
|
|
|
$enc = array(
|
|
|
|
'UTF-8', 'SJIS', 'BIG5', 'GB2312',
|
|
|
|
'UTF-8', 'SJIS', 'GB2312',
|
|
|
|
'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
|
|
|
|
'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
|
|
|
|
'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
|
|
|
|
'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
|
|
|
|
'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
|
|
|
|
'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
|
|
|
|
'WINDOWS-1252', 'WINDOWS-1251', 'EUC-JP', 'EUC-TW', 'KOI8-R',
|
|
|
|
'WINDOWS-1252', 'WINDOWS-1251', 'EUC-JP', 'EUC-TW', 'KOI8-R', 'BIG5',
|
|
|
|
'ISO-2022-KR', 'ISO-2022-JP'
|
|
|
|
'ISO-2022-KR', 'ISO-2022-JP',
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
$result = mb_detect_encoding($string, join(',', $enc));
|
|
|
|
$result = mb_detect_encoding($string, join(',', $enc));
|
|
|
|