From c2c7fa0aef2cb655ec2b1c5fdaa206607e440376 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 4 Mar 2008 17:12:04 +0000 Subject: [PATCH] Make sure encoding is not empty. Props tenpura. see #6902 git-svn-id: http://svn.automattic.com/wordpress/trunk@7156 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index 9c6249d34..b4711d563 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -355,9 +355,12 @@ require (ABSPATH . WPINC . '/pluggable.php'); * In most cases the default internal encoding is latin1, which is of no use, * since we want to use the mb_ functions for utf-8 strings */ -if ( function_exists('mb_internal_encoding') ) - mb_internal_encoding( get_option( 'blog_charset' ) ); - +if (function_exists('mb_internal_encoding')) { + if (get_option('blog_charset')) + mb_internal_encoding(get_option('blog_charset')); + else + mb_internal_encoding('UTF-8'); +} if ( defined('WP_CACHE') && function_exists('wp_cache_postload') )