Ticket #6092: 6092-2.diff

wp-settings.php

@@ -356 +356 @@
  * since we want to use the mb_ functions for utf-8 strings
  */
 if (function_exists('mb_internal_encoding')) {
-        if (get_option('blog_charset'))
-                mb_internal_encoding(get_option('blog_charset'));
-        else
+        if (!@mb_internal_encoding(get_option('blog_charset')))
                 mb_internal_encoding('UTF-8');
 }