Ticket #45746: 45746.diff

src/wp-includes/user.php

@@ -2187 +2187 @@
  *
  * @since 4.4.0
  *
- * @global wpdb         $wpdb      WordPress database abstraction object.
  * @global PasswordHash $wp_hasher Portable PHP password hashing framework.
  *
  * @param WP_User $user User to retrieve password reset key for.
@@ -2195 +2194 @@
  * @return string|WP_Error Password reset key on success. WP_Error on error.
  */
 function get_password_reset_key( $user ) {
-        global $wpdb, $wp_hasher;
+        global $wp_hasher;
 
         /**
          * Fires before a new password is retrieved.
@@ -2258 +2257 @@
                 $wp_hasher = new PasswordHash( 8, true );
         }
         $hashed    = time() . ':' . $wp_hasher->HashPassword( $key );
-        $key_saved = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
+        $key_saved = wp_update_user( array( 'ID' => $user->ID, 'user_activation_key' => $hashed, 'user_login' => $user->user_login ) );
+        clean_user_cache( $user->ID );
         if ( false === $key_saved ) {
                 return new WP_Error( 'no_password_key_update', __( 'Could not save password reset key to database.' ) );
         }