diff --git a/wp-includes/user.php b/wp-includes/user.php index ce43a159b1..c4c44a0c69 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -2749,6 +2749,11 @@ function retrieve_password( $user_login = null ) { return $key; } + // Localize password reset message content for user. + $locale = get_user_locale( $user_data ); + + $switched_locale = switch_to_locale( $locale ); + if ( is_multisite() ) { $site_name = get_network()->site_name; } else { @@ -2759,11 +2764,6 @@ function retrieve_password( $user_login = null ) { $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); } - // Localize password reset message content for user. - $locale = get_user_locale( $user_data ); - - $switched_locale = switch_to_locale( $locale ); - $message = __( 'Someone has requested a password reset for the following account:' ) . "\r\n\r\n"; /* translators: %s: Site name. */ $message .= sprintf( __( 'Site Name: %s' ), $site_name ) . "\r\n\r\n"; diff --git a/wp-includes/version.php b/wp-includes/version.php index bcf7f39057..9e46043c2e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-RC1-50438'; +$wp_version = '5.7-RC1-50440'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.