diff options
Diffstat (limited to 'program/lib/Roundcube/rcube_charset.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_charset.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php index 3e2dac19c..3657626bd 100644 --- a/program/lib/Roundcube/rcube_charset.php +++ b/program/lib/Roundcube/rcube_charset.php @@ -175,7 +175,6 @@ class rcube_charset 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 @@ class rcube_charset 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 @@ class rcube_charset 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"); } } |