sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@19059 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2011-10-25 05:09:03 +00:00
parent 51d0bd90f6
commit 01f19e3cff
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 )