diff --git a/wp-includes/user.php b/wp-includes/user.php index 7a71b78af9..5a3e6ddc98 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -110,6 +110,28 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) { } wp_set_auth_cookie( $user->ID, $credentials['remember'], $secure_cookie ); + + /** + * @global wpdb $wpdb WordPress database abstraction object. + */ + global $wpdb; + + // Flush `user_activation_key` if exists after successful login. + if ( ! empty( $user->user_activation_key ) ) { + $wpdb->update( + $wpdb->users, + array( + 'user_activation_key' => '', + ), + array( 'ID' => $user->ID ), + array( '%s' ), + array( '%d' ) + ); + + // Empty user_activation_key object. + $user->user_activation_key = ''; + } + /** * Fires after the user has successfully logged in. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 52f735f087..e68f3c08ac 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.6-alpha-58332'; +$wp_version = '6.6-alpha-58333'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.