Changeset 23373

Timestamp:

02/02/2013 02:01:29 AM (12 years ago)

Author:

nacin

Message:

Ensure we have a charset before calling mb_internal_encoding(), avoiding an unnecessary (if suppressed) warning. props dfavor. fixes #23093.

File:

• trunk/wp-includes/load.php (modified) (1 diff)

trunk/wp-includes/load.php

@@ -515 +515 @@
 function wp_set_internal_encoding() {
     if ( function_exists( 'mb_internal_encoding' ) ) {
-        if ( !@mb_internal_encoding( get_option( 'blog_charset' ) ) )
+        $charset = get_option( 'blog_charset' );
+        if ( ! $charset || ! @mb_internal_encoding( $charset ) )
             mb_internal_encoding( 'UTF-8' );
     }