From 6e80433a40769db67c79f469ad37baf37e219d1d Mon Sep 17 00:00:00 2001 From: ryan 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: http://svn.automattic.com/wordpress/trunk@7157 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index b4711d563..b924d4074 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'); }