Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 4 insertions, 4 deletions

diff --git a/program/include/rcube_mime.php b/program/include/rcube_mime.php
index 64ce67d5f..864d25599 100644
--- a/program/include/rcube_mime.php
+++ b/program/include/rcube_mime.php
@@ -214,7 +214,7 @@ class rcube_mime
                 // Append everything that is before the text to be decoded
                 if ($start != $pos) {
                     $substr = substr($input, $start, $pos-$start);
-                    $out   .= rcube_charset_convert($substr, $default_charset);
+                    $out   .= rcube_charset::convert($substr, $default_charset);
                     $start  = $pos;
                 }
                 $start += $length;
@@ -255,13 +255,13 @@ class rcube_mime
                     $text = quoted_printable_decode($text);
                 }
 
-                $out .= rcube_charset_convert($text, $charset);
+                $out .= rcube_charset::convert($text, $charset);
                 $tmp = array();
             }
 
             // add the last part of the input string
             if ($start != strlen($input)) {
-                $out .= rcube_charset_convert(substr($input, $start), $default_charset);
+                $out .= rcube_charset::convert(substr($input, $start), $default_charset);
             }
 
             // return the results
@@ -269,7 +269,7 @@ class rcube_mime
         }
 
         // no encoding information, use fallback
-        return rcube_charset_convert($input, $default_charset);
+        return rcube_charset::convert($input, $default_charset);
     }