Changeset 19059

Timestamp:

10/25/2011 05:09:03 AM (13 years ago)

Author:

nacin

Message:

Check get_site_option(WPLANG) when WP_INSTALLING in mulitiste, just not the blog's option. fixes #18783.

File:

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

trunk/wp-includes/l10n.php

@@ -37 +37 @@
 
     // If multisite, check options.
-    if ( is_multisite() && !defined('WP_INSTALLING') ) {
-        $ms_locale = get_option('WPLANG');
-        if ( $ms_locale === false )
+    if ( is_multisite() ) {
+        // Don't check blog option when installing.
+        if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) )
             $ms_locale = get_site_option('WPLANG');