WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2022-01-19 13:39:01 +00:00
parent 3bc7449859
commit f8c10a28f5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/user.php
View File

@ -3030,7 +3030,10 @@ function retrieve_password( $user_login = null ) {
return true; 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( $defaults = array(
'to' => $user_email, 'to' => $user_email,
'subject' => $title, 'subject' => $title,
@ -3045,7 +3048,7 @@ function retrieve_password( $user_login = null ) {
* *
* @since 6.0.0 * @since 6.0.0
* *
* @param array $notification_email { * @param array $defaults {
* The default notification email arguments. Used to build wp_mail(). * The default notification email arguments. Used to build wp_mail().
* *
* @type string $to The intended recipient - user email address. * @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. * @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 ) { if ( $switched_locale ) {
restore_previous_locale(); restore_previous_locale();

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.