Changeset 39169 for trunk/src/wp-admin/includes/user.php

Timestamp:

11/08/2016 11:00:38 PM (8 years ago)

Author:

swissspidy

Message:

I18N: Add ability to change user's locale back to site's locale.

Previously there was no way to remove the user locale setting again, even though that might be desirable.

This adds a new 'Site Default' option to the user-specific language setting by introducing a new show_site_locale_default argument to wp_dropdown_languages().

Props ocean90.
See #29783.
Fixes #38632.

File:

• trunk/src/wp-admin/includes/user.php (modified) (1 diff)

trunk/src/wp-admin/includes/user.php

@@ -99 +99 @@
         if ( isset( $_POST['locale'] ) ) {
             $locale = sanitize_text_field( $_POST['locale'] );
-            if ( ! in_array( $locale, get_available_languages(), true ) ) {
+            if ( 'site-default' === $locale ) {
                 $locale = '';
+            } elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
+                $locale = 'en_US';
             }
 
-            $user->locale = ( '' === $locale ) ? 'en_US' : $locale;
+            $user->locale = $locale;
         }
     }