Ticket #14553: 14553.diff

wp-includes/update.php

@@ -33 +33 @@
                 $current->version_checked = $wp_version;
         }
 
-        $locale = apply_filters( 'core_version_check_locale', get_locale() );
+        $locale = apply_filters( 'core_version_check_locale', get_locale( true ) );
 
         // Update last_checked for current to prevent multiple blocking requests if request hangs
         $current->last_checked = time();

wp-includes/l10n.php

@@ -23 +23 @@
  * @uses apply_filters() Calls 'locale' hook on locale value.
  * @uses $locale Gets the locale stored in the global.
  *
+ * @param bool $network Whether to retrieve the network wide setting when running
+ *      multisite. Optional, default false.
  * @return string The locale of the blog or from the 'locale' hook.
  */
-function get_locale() {
+function get_locale( $network = false ) {
         global $locale;
 
         if ( isset( $locale ) )
@@ -37 +39 @@
 
         // If multisite, check options.
         if ( is_multisite() && !defined('WP_INSTALLING') ) {
-                $ms_locale = get_option('WPLANG');
-                if ( $ms_locale === false )
+                if ( $network || false === get_option('WPLANG') )
                         $ms_locale = get_site_option('WPLANG');
 
                 if ( $ms_locale !== false )