WordPress.org

Make WordPress Core

Changeset 19059


Ignore:
Timestamp:
10/25/2011 05:09:03 AM (7 years ago)
Author:
nacin
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/l10n.php

    r18995 r19059  
    3737
    3838    // If multisite, check options.
    39     if ( is_multisite() && !defined('WP_INSTALLING') ) {
    40         $ms_locale = get_option('WPLANG');
    41         if ( $ms_locale === false )
     39    if ( is_multisite() ) {
     40        // Don't check blog option when installing.
     41        if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) )
    4242            $ms_locale = get_site_option('WPLANG');
    4343
Note: See TracChangeset for help on using the changeset viewer.