WordPress.org

Make WordPress Core


Ignore:
Timestamp:
01/29/2010 07:03:51 PM (10 years ago)
Author:
ryan
Message:

Integrate mu_locale() into get_locale(). see #11644

File:
1 edited

Legend:

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

    r12840 r12900  
    3535    if ( defined( 'WPLANG' ) )
    3636        $locale = WPLANG;
     37
     38    // If multisite, check options.
     39    if ( is_multisite() && !defined('WP_INSTALLING') ) {
     40        $ms_locale = get_option('WPLANG');
     41        if ( $ms_locale === false )
     42            $ms_locale = get_site_option('WPLANG');
     43
     44        if ( $ms_locale !== false )
     45            $locale = $ms_locale;
     46    }
    3747
    3848    if ( empty( $locale ) )
Note: See TracChangeset for help on using the changeset viewer.