Ticket #28435: 28435.3.diff

src/wp-includes/user-functions.php

@@ -1602 +1602 @@
         // Escape data pulled from DB.
         $user = add_magic_quotes( $user );
 
-        if ( ! empty($userdata['user_pass']) ) {
+        if ( ! empty( $userdata['user_pass'] ) && $userdata['user_pass'] !== $user_obj->user_pass ) {
                 // If password is changing, hash it now
                 $plaintext_pass = $userdata['user_pass'];
                 $userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] );

tests/phpunit/tests/user.php

@@ -954 +954 @@
 
                 wp_new_user_notification( $user, 'this_is_deprecated' );
         }
+        /**
+         * @ticket 28435
+         */
+        function test_wp_update_user_no_change_pwd() {
+                $testuserid = 1;
+                $user = get_userdata( $testuserid );
+                $pwd_before = $user->user_pass;
+                wp_update_user( $user );
+                // Reload the data
+                $user = get_userdata( $testuserid );
+                $pwd_after = $user->user_pass;
+                $this->assertEquals( $pwd_before, $pwd_after );
+        }
 }