From 40e1c2d14d11c679d97c00ce831b32d43fad4d32 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 12 Sep 2012 05:16:00 -0400
Subject: [PATCH] Don't use charset aliases for destination charset - fixes e.g. converting to US-ASCII
---
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 1740a60..039d5b1 100644
--- a/program/include/rcube_charset.php
+++ b/program/include/rcube_charset.php
@@ -86,7 +86,7 @@
* 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 @@
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)
--
Gitblit v1.9.1