summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-04-20 07:49:28 +0000
committeralecpl <alec@alec.pl>2010-04-20 07:49:28 +0000
commit9096de8520ce4bfa50dcf896da1dea914f8c9ec8 (patch)
tree6167e1ed6ba6b576ccc3c7f155373d3c9d78235b /program/include
parent23362230b59e89c63743c8d174f0fe11533e59b2 (diff)
- handle WIN-* charset as WINDOWS-*
Diffstat (limited to 'program/include')
-rw-r--r--program/include/main.inc4
1 files 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;