summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-18 20:29:50 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-18 20:29:50 +0000
commit909b835b156fd2a62c2ca22e4f24cc66742fa399 (patch)
tree3ea5d0cec6e9d68b2816566cd502550097047ecd
parentfda72711f50953ca7d922f884c9279ddf988d6b9 (diff)
Treat US-ASCII as Latin-1 to give messages with wrong charset definition a chance
git-svn-id: https://svn.roundcube.net/trunk@1836 208e9e7b-5314-0410-a742-e7e81cd9613c
-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 908ca3adc..0eb8dc757 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -212,6 +212,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
return $str;
$aliases = array(
+ 'US-ASCII' => 'ISO-8859-1',
'UNKNOWN-8BIT' => 'ISO-8859-15',
'X-UNKNOWN' => 'ISO-8859-15',
'X-USER-DEFINED' => 'ISO-8859-15',