diff options
author | Aleksander Machniak <alec@alec.pl> | 2012-09-12 11:16:00 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2012-09-12 11:16:00 +0200 |
commit | 40e1c2d14d11c679d97c00ce831b32d43fad4d32 (patch) | |
tree | c8f16ddfcce4ca8b62a4bcdd38b697d12c42a041 | |
parent | a04a74fec4b5e13e8464f1f3c9071fa0b56a13eb (diff) |
Don't use charset aliases for destination charset - fixes e.g.
converting to US-ASCII
-rw-r--r-- | program/include/rcube_charset.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php index 1740a6096..039d5b1bf 100644 --- a/program/include/rcube_charset.php +++ b/program/include/rcube_charset.php @@ -86,7 +86,7 @@ class rcube_charset * Sometimes charset string is malformed, there are also charset aliases * but we need strict names for charset conversion (specially utf8 class) * - * @param string Input charset name + * @param string $input Input charset name * * @return string The validated charset name */ @@ -178,7 +178,7 @@ class rcube_charset static $mbstring_list = null; static $conv = null; - $to = empty($to) ? strtoupper(RCMAIL_CHARSET) : self::parse_charset($to); + $to = empty($to) ? strtoupper(RCMAIL_CHARSET) : $to; $from = self::parse_charset($from); // It is a common case when UTF-16 charset is used with US-ASCII content (#1488654) |