- handle WIN-* charset as WINDOWS-*

14 years ago · 9096de8520
parent 23362230b5
commit 9096de8520
1 changed files with 2 additions and 2 deletions
--- a/program/include/main.inc
+++ b/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;