Ticket #29456: 29456.diff

src/wp-admin/options-general.php

@@ -305 +305 @@
 
 <?php
 $languages = get_available_languages();
-if ( ! empty( $languages ) ) {
+if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
+        $languages[] = WPLANG;
+}
+if ( $languages ) {
         ?>
         <tr>
                 <th width="33%" scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>

src/wp-includes/formatting.php

@@ -3361 +3361 @@
 
                 case 'WPLANG':
                         $allowed = get_available_languages();
-                        if ( ! in_array( $value, $allowed ) && ! empty( $value ) )
+                        if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG ) {
+                                $allowed[] = WPLANG;
+                        }
+                        if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) {
                                 $value = get_option( $option );
+                        }
                         break;
 
                 case 'illegal_names':