diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-04-20 07:49:28 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-04-20 07:49:28 +0000 |
| commit | 8d77ec09ed25ca171ff66f7c27fce86a138c619e (patch) | |
| tree | e9628a3f4601efa05e7dfc1c9f0176cb705612b9 /roundcubemail/program/include/main.inc | |
| parent | 81c59279919cb8a1cc54939b07f44d3838313126 (diff) | |
- handle WIN-* charset as WINDOWS-*
git-svn-id: https://svn.roundcube.net/trunk@3509 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/main.inc')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 490217015..d2f28cdce 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -380,8 +380,8 @@ function rcube_parse_charset($charset) } // handle broken charset names e.g. WINDOWS-1250HTTP-EQUIVCONTENT-TYPE - if (preg_match('/WINDOWS([0-9]+)/', $str, $m)) { - return 'WINDOWS-' . $m[1]; + if (preg_match('/(WIN|WINDOWS)([0-9]+)/', $str, $m)) { + return 'WINDOWS-' . $m[2]; } return $charset; |