Ticket #18783: 18783.diff

wp-includes/l10n.php

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