From 01f19e3cfff59769322442ae38c30cd9c004be01 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 25 Oct 2011 05:09:03 +0000 Subject: [PATCH] Check get_site_option(WPLANG) when WP_INSTALLING in mulitiste, just not the blog's option. fixes #18783. git-svn-id: https://develop.svn.wordpress.org/trunk@19059 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/l10n.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index d468ae33de..733f3a4473 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -36,9 +36,9 @@ function get_locale() { $locale = WPLANG; // 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'); if ( $ms_locale !== false )