From 9096de8520ce4bfa50dcf896da1dea914f8c9ec8 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 20 Apr 2010 07:49:28 +0000 Subject: - handle WIN-* charset as WINDOWS-* --- program/include/main.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/include/main.inc b/program/include/main.inc index 490217015..d2f28cdce 100644 --- 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; -- cgit v1.2.3