WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@19059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-10-25 05:09:03 +00:00
parent 1154e4b468
commit 935a533eb6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/l10n.php
View File

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