From 295efea5c114378f9c5509659badb18ff16b0642 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 12 Sep 2012 11:16:00 +0200 Subject: Don't use charset aliases for destination charset - fixes e.g. converting to US-ASCII Conflicts: program/include/rcube_charset.php --- program/include/rcube_charset.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php index fc1685d28..2c8d3a0dd 100644 --- a/program/include/rcube_charset.php +++ b/program/include/rcube_charset.php @@ -89,7 +89,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 */ @@ -182,7 +182,7 @@ class rcube_charset static $mbstring_list = null; static $conv = null; - $to = empty($to) ? strtoupper(RCMAIL_CHARSET) : self::parse($to); + $to = empty($to) ? strtoupper(RCMAIL_CHARSET) : $to; $from = self::parse($from); // It is a common case when UTF-16 charset is used with US-ASCII content (#1488654) -- cgit v1.2.3