diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2015-09-06 12:44:12 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2015-09-06 12:44:12 +0200 |
| commit | a52e66ebe0d98854108f366a9dc3be3790d18180 (patch) | |
| tree | db218ba970a19821db63b1616c86d70ee89cecd1 /template/en | |
| parent | e76030a30c35bb23b0bf6d284e32b13384fd4954 (diff) | |
| download | bugs-a52e66ebe0d98854108f366a9dc3be3790d18180.tar bugs-a52e66ebe0d98854108f366a9dc3be3790d18180.tar.gz bugs-a52e66ebe0d98854108f366a9dc3be3790d18180.tar.bz2 bugs-a52e66ebe0d98854108f366a9dc3be3790d18180.tar.xz bugs-a52e66ebe0d98854108f366a9dc3be3790d18180.zip | |
Bug 1194987: Editing your email address and make it point to a non-existent email address makes Bugzilla stop working
r=gerv a=sgreen
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/account/email/change-new.txt.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/account/email/change-old.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/account/prefs/prefs.html.tmpl | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index a6c54a773..f32abd80d 100644 --- a/template/en/default/account/email/change-new.txt.tmpl +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -7,12 +7,12 @@ #%] From: [% Param('mailfrom') %] -To: [% emailaddress %] +To: [% newemailaddress %] Subject: [% terms.Bugzilla %] Change Email Address Request X-Bugzilla-Type: admin [%+ terms.Bugzilla %] has received a request to change the email address -for the account [% oldemailaddress %] to your address. +for the account [% user.email %] to your address. To confirm the change, visit the following link: diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl index 24b90a2b0..400004c5a 100644 --- a/template/en/default/account/email/change-old.txt.tmpl +++ b/template/en/default/account/email/change-old.txt.tmpl @@ -7,7 +7,7 @@ #%] From: [% Param('mailfrom') %] -To: [% emailaddress %] +To: [% user.email %] Subject: [% terms.Bugzilla %] Change Email Address Request Importance: High X-MSMail-Priority: High diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index 8875eb26f..5de0bf422 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -76,6 +76,10 @@ In order to confirm your request, we have sent an email to your new email address. As a precaution, an email has also been sent to your old address allowing you to cancel this change if needed. + If you don't receive the email, you can + <a href="token.cgi?t=[% email_token FILTER uri %]&a=cxlem"> + cancel the email address change</a> from here if you wish (especially + if you mistyped the new email address). </p> [% END %] </div> |