Avoid unnecessary strtoupper() calls but validate target charset if specified

12 years ago · 9546d22c67
parent 27be4e7644
commit 9546d22c67
1 changed files with 1 additions and 1 deletions
--- 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)