Changeset 58653

Timestamp:

07/03/2024 04:08:55 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Users: Pass the previous state of the user as context to the wp_set_password hook.

Follow-up to [55056], [55250].

Props dd32.
Fixes #61541.

Location:

trunk

Files:

• src/wp-includes/pluggable.php (modified) (2 diffs)
• tests/phpunit/tests/auth.php (modified) (2 diffs)

trunk/src/wp-includes/pluggable.php

@@ -2769 +2769 @@
                 global $wpdb;
 
+                $old_user_data = get_userdata( $user_id );
+
                 $hash = wp_hash_password( $password );
                 $wpdb->update(
@@ -2785 +2787 @@
                  *
                  * @since 6.2.0
-                 *
-                 * @param string $password The plaintext password just set.
-                 * @param int    $user_id  The ID of the user whose password was just set.
-                 */
-                do_action( 'wp_set_password', $password, $user_id );
+                 * @since 6.7.0 The `$old_user_data` parameter was added.
+                 *
+                 * @param string  $password      The plaintext password just set.
+                 * @param int     $user_id       The ID of the user whose password was just set.
+                 * @param WP_User $old_user_data Object containing user's data prior to update.
+                 */
+                do_action( 'wp_set_password', $password, $user_id, $old_user_data );
         }
 endif;

trunk/tests/phpunit/tests/auth.php

@@ -116 +116 @@
          *
          * @ticket 57436
+         * @ticket 61541
          *
          * @covers ::wp_set_password
@@ -122 +123 @@
                 $action = new MockAction();
 
-                add_action( 'wp_set_password', array( $action, 'action' ) );
-                wp_set_password( 'A simple password', self::$user_id );
+                $previous_user_pass = get_user_by( 'id', $this->user->ID )->user_pass;
+
+                add_action( 'wp_set_password', array( $action, 'action' ), 10, 3 );
+                wp_set_password( 'A simple password', $this->user->ID );
 
                 $this->assertSame( 1, $action->get_call_count() );
+
+                // Check that the old data passed through the hook is correct.
+                $this->assertSame( $previous_user_pass, $action->get_args()[0][2]->user_pass );
         }