Ticket #28435: 28435.2.diff

src/wp-includes/user.php

@@ -1887 +1887 @@
  * @return int|WP_Error The updated user's ID or a WP_Error object if the user could not be updated.
  */
 function wp_update_user($userdata) {
-        if ( is_a( $userdata, 'stdClass' ) )
+        if ( is_a( $userdata, 'stdClass' ) ) {
                 $userdata = get_object_vars( $userdata );
-        elseif ( is_a( $userdata, 'WP_User' ) )
+        } elseif ( is_a( $userdata, 'WP_User' ) ) {
                 $userdata = $userdata->to_array();
+        }
 
         $ID = (int) $userdata['ID'];
 
         // First, get all of the original fields
         $user_obj = get_userdata( $ID );
-        if ( ! $user_obj )
+        if ( ! $user_obj ) {
                 return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+        }
 
         $user = $user_obj->to_array();
 
@@ -1910 +1912 @@
         $user = add_magic_quotes( $user );
 
         // If password is changing, hash it now.
-        if ( ! empty($userdata['user_pass']) ) {
+        if ( ! empty( $userdata['user_pass'] ) && $userdata['user_pass'] !== $user_obj->user_pass ) {
                 $plaintext_pass = $userdata['user_pass'];
                 $userdata['user_pass'] = wp_hash_password($userdata['user_pass']);
         }