summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-01-12 14:22:41 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-01-12 14:22:41 +0000
commit7a1ea2d8aba45a6a803ed36368f9675d12b1f256 (patch)
treebcfaccaa54ac4e30c926d5b3c053373771477257 /roundcubemail/program/include
parente686c0dd2aaef65419c3d14929953052ef7b09c2 (diff)
- added charset alias for MACROMAN (MACINTOSH) (#1486424)
git-svn-id: https://svn.roundcube.net/trunk@3201 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include')
-rw-r--r--roundcubemail/program/include/main.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 0ed9bf0c3..6b738e37a 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -322,6 +322,7 @@ function rcube_parse_charset($charset)
'TIS620' => 'WINDOWS-874',
'ISO88599' => 'WINDOWS-1254',
'ISO885911' => 'WINDOWS-874',
+ 'MACROMAN' => 'MACINTOSH',
);
// allow a-z and 0-9 only and remove X- prefix (e.g. X-ROMAN8 => ROMAN8)