Changeset 29691
- Timestamp:
- 09/03/2014 08:02:53 AM (9 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/options-general.php
r29630 r29691 306 306 <?php 307 307 $languages = get_available_languages(); 308 if ( ! empty( $languages ) ) { 308 if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) { 309 $languages[] = WPLANG; 310 } 311 if ( $languages ) { 309 312 ?> 310 313 <tr> -
trunk/src/wp-includes/formatting.php
r29479 r29691 3362 3362 case 'WPLANG': 3363 3363 $allowed = get_available_languages(); 3364 if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) 3364 if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG ) { 3365 $allowed[] = WPLANG; 3366 } 3367 if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) { 3365 3368 $value = get_option( $option ); 3369 } 3366 3370 break; 3367 3371
Note: See TracChangeset
for help on using the changeset viewer.