Changeset 12900

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk/wp-includes

Files:

• l10n.php (modified) (1 diff)
• ms-default-filters.php (modified) (1 diff)
• ms-functions.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 ) )

trunk/wp-includes/ms-default-filters.php

@@ -14 +14 @@
 // Register Nonce
 add_action ( 'signup_hidden_fields', 'signup_nonce_fields' );
-
-// Locale
-add_filter ( 'locale', 'mu_locale' );
 
 // Template

trunk/wp-includes/ms-functions.php

@@ -1753 +1753 @@
 }
 
-function mu_locale( $locale ) {
-        if ( defined('WP_INSTALLING') == false ) {
-                $mu_locale = get_option('WPLANG');
-                if ( $mu_locale === false )
-                        $mu_locale = get_site_option('WPLANG');
-
-                if ( $mu_locale !== false )
-                        return $mu_locale;
-        }
-        return $locale;
-}
-
 function signup_nonce_fields() {
         $id = mt_rand();