Changeset 29691

Timestamp:

09/03/2014 08:02:53 AM (9 years ago)

Author:

nacin

Message:

Allow language specified by the WPLANG constant (but not installed) to be chosen.

fixes #29456.

Location:

trunk/src

Files:

• wp-admin/options-general.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)

trunk/src/wp-admin/options-general.php

@@ -306 +306 @@
 <?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>

trunk/src/wp-includes/formatting.php

@@ -3362 +3362 @@
         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;