diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-10-15 14:35:56 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-10-15 14:35:56 +0200 |
| commit | 9546d22c67fda4cbc4a9141dca11944e885ce8a7 (patch) | |
| tree | 60527b966e8739586e5dcc1b039d8d24894756d1 | |
| parent | 27be4e7644637255d7adbf5386ec883d9c2c64cd (diff) | |
Avoid unnecessary strtoupper() calls but validate target charset if specified
| -rw-r--r-- | program/include/rcube_charset.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php index 35c69729b..50ddc19f4 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) ? strtoupper(RCMAIL_CHARSET) : $to; + $to = empty($to) ? RCMAIL_CHARSET : self::parse_charset($to); $from = self::parse_charset($from); // It is a common case when UTF-16 charset is used with US-ASCII content (#1488654) |