Changeset 1331

Timestamp:

06/17/08 15:35:07 (6 months ago)

Author:

donncha

Message:

Move locale setup into a filter, may fix #655

Files:

• trunk/wp-includes/wpmu-functions.php (modified) (1 diff)
• trunk/wp-settings.php (modified) (1 diff)

trunk/wp-includes/wpmu-functions.php

@@ -1910 +1910 @@
-add_filter('media_upload_form_url', 'wpmu_upload_bypass_url');
-
+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;
+}
+add_filter( 'locale', 'mu_locale' );
+
-?>

trunk/wp-settings.php

@@ -312 +312 @@
-define('COOKIEHASH', '' );
-
-if( defined('WP_INSTALLING') == false ) {
-        $locale = get_option('WPLANG');
-        if( $locale === false )
-                $locale = get_site_option('WPLANG');
-}
-
-$wpdb->hide_errors();
-if( defined( 'MUPLUGINDIR' ) == false )