Changeset 45712

Timestamp:

08/01/2019 03:29:02 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Users: Use get_password_reset_key() in wp_new_user_notification().

Props mrasharirfan, spacedmonkey.
Fixes #45745.

File:

• trunk/src/wp-includes/pluggable.php (modified) (3 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1894 +1894 @@
          * @since 4.6.0 The `$notify` parameter accepts 'user' for sending notification only to the user created.
          *
-         * @global wpdb         $wpdb      WordPress database object for queries.
-         * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance.
-         *
          * @param int    $user_id    User ID.
          * @param null   $deprecated Not used (argument deprecated).
@@ -1912 +1909 @@
                 }
 
-                global $wpdb, $wp_hasher;
                 $user = get_userdata( $user_id );
 
@@ -1972 +1968 @@
                 }
 
-                // Generate something random for a password reset key.
-                $key = wp_generate_password( 20, false );
-
-                /** This action is documented in wp-login.php */
-                do_action( 'retrieve_password_key', $user->user_login, $key );
-
-                // Now insert the key, hashed, into the DB.
-                if ( empty( $wp_hasher ) ) {
-                        require_once ABSPATH . WPINC . '/class-phpass.php';
-                        $wp_hasher = new PasswordHash( 8, true );
-                }
-                $hashed = time() . ':' . $wp_hasher->HashPassword( $key );
-                $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
+                $key = get_password_reset_key( $user );
+                if ( is_wp_error( $key ) ) {
+                        return;
+                }
 
                 $switched_locale = switch_to_locale( get_user_locale( $user ) );