From f8c10a28f5ea40dfc036b34a9ea58adacd80fbe3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 19 Jan 2022 13:39:01 +0000
Subject: [PATCH] Users: Revert the variable change in [52606] that caused the
 tests to fail.

Follow-up to [52604-52606].

Props audrasjb.
See #54690.
Built from https://develop.svn.wordpress.org/trunk@52607


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

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 87536d7182..3a11fa10bf 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -3030,7 +3030,10 @@ function retrieve_password( $user_login = null ) {
 		return true;
 	}
 
-	// Wrap the single notification email arguments in an array to pass them to the retrieve_password_notification_email filter.
+	/*
+	 * Wrap the single notification email arguments in an array
+	 * to pass them to the retrieve_password_notification_email filter.
+	 */
 	$defaults = array(
 		'to'      => $user_email,
 		'subject' => $title,
@@ -3045,7 +3048,7 @@ function retrieve_password( $user_login = null ) {
 	 *
 	 * @since 6.0.0
 	 *
-	 * @param array $notification_email {
+	 * @param array $defaults {
 	 *     The default notification email arguments. Used to build wp_mail().
 	 *
 	 *     @type string $to      The intended recipient - user email address.
@@ -3061,7 +3064,7 @@ function retrieve_password( $user_login = null ) {
 	 *     @type WP_User $user_data  WP_User object.
 	 * }
 	 */
-	$notification_email = apply_filters( 'retrieve_password_notification_email', $notification_email, $data );
+	$notification_email = apply_filters( 'retrieve_password_notification_email', $defaults, $data );
 
 	if ( $switched_locale ) {
 		restore_previous_locale();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index add68be832..5ac8393b7d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-52606';
+$wp_version = '6.0-alpha-52607';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.