Thomas Bruederli
2015-02-07 2f8b1036da42ec3d15a51c6b17a473f9f4df71d3
program/lib/Roundcube/rcube_charset.php
@@ -175,7 +175,6 @@
        static $iconv_options   = null;
        static $mbstring_list   = null;
        static $mbstring_sch    = null;
        static $conv            = null;
        $to   = empty($to) ? RCUBE_CHARSET : $to;
        $from = self::parse_charset($from);
@@ -274,7 +273,7 @@
                return utf8_encode($str);
            }
            else  {
                user_error("No suitable function found for UTF-8 encoding", E_USER_WARNING);
                trigger_error("No suitable function found for UTF-8 encoding");
            }
        }
@@ -290,7 +289,7 @@
                return utf8_decode($str);
            }
            else {
                user_error("No suitable function found for UTF-8 decoding", E_USER_WARNING);
                trigger_error("No suitable function found for UTF-8 decoding");
            }
        }