From f7b4147beaf9efb6becdee1f07e4d6a008c1b63a Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Wed, 29 Apr 2020 15:25:07 +0000
Subject: [PATCH] User: Invalidate `user_activation_key` on password update.

Props: sstoqnov, sergeybiryukov.


Built from https://develop.svn.wordpress.org/trunk@47634


git-svn-id: http://core.svn.wordpress.org/trunk@47409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/user.php    | 2 +-
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 4404a4b90b..bf9472d8cf 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -1812,7 +1812,7 @@ function wp_insert_user( $userdata ) {
 	}
 
 	if ( $update ) {
-		if ( $user_email !== $old_user_data->user_email ) {
+		if ( $user_email !== $old_user_data->user_email || $user_pass !== $old_user_data->user_pass ) {
 			$data['user_activation_key'] = '';
 		}
 		$wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6d4fcc6bac..4da7817f1a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-47633';
+$wp_version = '5.5-alpha-47634';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.