WordPress 4.7.1-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / user.php

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index f6c52dd9549174043060dda89ac536c6fd616903..d962717a0dd8f4d955928cd279501b900e3246e2 100644 (file)
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -94,6 +94,20 @@ function edit_user( $user_id = 0 ) {
                $user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
                $user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
                $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+               $user->locale = '';
+
+               if ( isset( $_POST['locale'] ) ) {
+                       $locale = sanitize_text_field( $_POST['locale'] );
+                       if ( 'site-default' === $locale ) {
+                               $locale = '';
+                       } elseif ( '' === $locale ) {
+                               $locale = 'en_US';
+                       } elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
+                               $locale = '';
+                       }
+
+                       $user->locale = $locale;
+               }
        }
 
        $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
@@ -171,7 +185,7 @@ function edit_user( $user_id = 0 ) {
         *
         * @param WP_Error &$errors WP_Error object, passed by reference.
         * @param bool     $update  Whether this is a user update.
-        * @param WP_User  &$user   WP_User object, passed by reference.
+        * @param stdClass &$user   User object, passed by reference.
         */
        do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );