From ddc8032efd799dea10276032632f8f06edca344d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 28 Jun 2018 02:28:08 +0000
Subject: [PATCH] Users: In `wp_validate_user_request_key()`, properly return
 the `WP_Error` object in case the confirmation email has expired.

Props itowhid06.
Merges [43331] to the 4.9 branch.
Fixes #44298.
Built from https://develop.svn.wordpress.org/branches/4.9@43342


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43170 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 da9fb12ac7..30d0002944 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -3431,7 +3431,7 @@ function wp_validate_user_request_key( $request_id, $key ) {
 	}
 
 	if ( ! $expiration_time || time() > $expiration_time ) {
-		$return = new WP_Error( 'expired_key', __( 'The confirmation email has expired.' ) );
+		return new WP_Error( 'expired_key', __( 'The confirmation email has expired.' ) );
 	}
 
 	return true;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 004c19655e..cfe306a9e7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.7-alpha-43316';
+$wp_version = '4.9.7-alpha-43342';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.