From 186b3faecf0b26742a5bd79e55c0297e7b5bbfa0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 26 Feb 2021 11:15:54 +0000
Subject: [PATCH] Users: Use localized site title for password reset emails.
When sending password reset emails, switch to the user's locale prior to obtaining the site title to allow for plugins filtering based on locale.
Follow up to [50129,50139-50141,50152,50415].
Props chouby.
Merges [50439] to the 5.7 branch.
Fixes #52605. See #34281.
git-svn-id: https://develop.svn.wordpress.org/branches/5.7@50440 602fd350-edb4-49c9-b593-d223f7449a82
---
src/wp-includes/user.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index ce43a159b1..c4c44a0c69 100644
--- a/src/wp-includes/user.php
+++ b/src/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";