From f9e7e6a590c6b83191c17a81b02fb73d2e354615 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Tue, 4 Mar 2008 19:25:00 +0000 Subject: [PATCH] Fallback to UTF-8 if not valid mb_internal_encoding. Props tenpura. fixes #6092 git-svn-id: https://develop.svn.wordpress.org/trunk@7157 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-settings.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index b4711d563d..b924d40748 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -356,9 +356,7 @@ require (ABSPATH . WPINC . '/pluggable.php'); * 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'); }