summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-10-15 15:38:13 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-10-15 15:38:13 +0200
commit08df33b5c25577cf42d7f524eeaa367cbde886fb (patch)
tree32149a77c715cd42f713a93a3132d8c6c0fe7e73 /program
parent0f7d11e7984f9997fdf9b5b6a6d699030d62dfe4 (diff)
Partially revert 9546d22c6: don't validate with parse_charset()
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_charset.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php
index 50ddc19f4..ff4c2bbce 100644
--- a/program/include/rcube_charset.php
+++ b/program/include/rcube_charset.php
@@ -179,7 +179,7 @@ class rcube_charset
static $mbstring_sch = null;
static $conv = null;
- $to = empty($to) ? RCMAIL_CHARSET : self::parse_charset($to);
+ $to = empty($to) ? RCMAIL_CHARSET : $to;
$from = self::parse_charset($from);
// It is a common case when UTF-16 charset is used with US-ASCII content (#1488654)