diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-08-09 23:32:49 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-08-09 23:32:49 +0200 |
| commit | 1d1d963c14d9db54df69469758163f1f50a9b4b3 (patch) | |
| tree | 81a6c685907b6c669872acf02348a3c5c78e06f9 | |
| parent | cfea54f8f366379de0bc75781da1c71cb06cc1ec (diff) | |
| download | forums-1d1d963c14d9db54df69469758163f1f50a9b4b3.tar forums-1d1d963c14d9db54df69469758163f1f50a9b4b3.tar.gz forums-1d1d963c14d9db54df69469758163f1f50a9b4b3.tar.bz2 forums-1d1d963c14d9db54df69469758163f1f50a9b4b3.tar.xz forums-1d1d963c14d9db54df69469758163f1f50a9b4b3.zip | |
[ticket/11327] Adjust wording of forgot password email
PHPBB3-11327
| -rw-r--r-- | phpBB/language/en/email/user_forgot_password.txt | 14 | ||||
| -rw-r--r-- | phpBB/phpbb/ucp/controller/reset_password.php | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/phpBB/language/en/email/user_forgot_password.txt b/phpBB/language/en/email/user_forgot_password.txt index 965d5a552c..4826a7bfd9 100644 --- a/phpBB/language/en/email/user_forgot_password.txt +++ b/phpBB/language/en/email/user_forgot_password.txt @@ -1,17 +1,13 @@ -Subject: New password activation +Subject: Account password reset Hello {USERNAME} -You are receiving this notification because you have (or someone pretending to be you has) requested a new password be sent for your account on "{SITENAME}". If you did not request this notification then please ignore it, if you keep receiving it please contact the board administrator. +You are receiving this notification because you have requested to recover a forgotten password for your account on "{SITENAME}". -To use the new password you need to activate it. To do this click the link provided below. +To reset your password, please click the link provided below: -{U_ACTIVATE} +{U_RESET_PASSWORD} -If successful you will be able to login using the following password: - -Password: {PASSWORD} - -You can of course change this password yourself via the profile page. If you have any difficulties please contact the board administrator. +If you did not authorize the request you can ignore this email. Please contact the board administrator if you keep receiving it. {EMAIL_SIG} diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index 57fef00f79..4b2660aebb 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -221,8 +221,8 @@ class reset_password $messenger->anti_abuse_headers($this->config, $this->user); $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($user_row['username']), - 'U_ACTIVATE' => $this->helper->route('phpbb_ucp_reset_password_controller') + 'USERNAME' => htmlspecialchars_decode($user_row['username']), + 'U_RESET_PASSWORD' => $this->helper->route('phpbb_ucp_reset_password_controller') )); $messenger->send($user_row['user_notify_type']); |