From 8ddef3e98d500fdf4ae8e073702184da5ead1560 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Tue, 15 Jan 2019 06:27:49 +0000
Subject: [PATCH] Users: Check that a valid user is passed to
 `get_password_reset_key()`.

Props edocev.
Fixes #44601.


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


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

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 4c14aa6451..d0b760986c 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -2217,6 +2217,10 @@ function wp_get_password_hint() {
 function get_password_reset_key( $user ) {
 	global $wpdb, $wp_hasher;
 
+	if ( ! ( $user instanceof WP_User ) ) {
+		return new WP_Error( 'invalidcombo', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
+	}
+
 	/**
 	 * Fires before a new password is retrieved.
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 038fdf8325..beb08a0cb9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.1-beta1-44601';
+$wp_version = '5.1-beta1-44602';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.