Changeset 12900 for trunk/wp-includes/l10n.php

Timestamp:

01/29/2010 07:03:51 PM (16 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-includes/l10n.php (modified) (1 diff)

trunk/wp-includes/l10n.php

@@ -35 +35 @@
     if ( defined( 'WPLANG' ) )
         $locale = WPLANG;
+
+    // If multisite, check options.
+    if ( is_multisite() && !defined('WP_INSTALLING') ) {
+        $ms_locale = get_option('WPLANG');
+        if ( $ms_locale === false )
+            $ms_locale = get_site_option('WPLANG');
+
+        if ( $ms_locale !== false )
+            $locale = $ms_locale;
+    }
 
     if ( empty( $locale ) )