summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2015-09-06 12:41:31 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2015-09-06 12:41:31 +0200
commit23807179790108fc2575d06df59dbaebf8ce0af8 (patch)
treeed9e1b383de7f72f1892c66552640240c431f5f2 /template/en
parenta666b2a74f565a5ebb38f0ce0b400d04b1ea7ca4 (diff)
downloadbugzilla-23807179790108fc2575d06df59dbaebf8ce0af8.tar.gz
bugzilla-23807179790108fc2575d06df59dbaebf8ce0af8.tar.xz
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.tmpl4
-rw-r--r--template/en/default/account/email/change-old.txt.tmpl2
-rw-r--r--template/en/default/account/prefs/prefs.html.tmpl4
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 8d90d7b6e..ea47b7663 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -75,6 +75,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 %]&amp;a=cxlem">
+ cancel the email address change</a> from here if you wish (especially
+ if you mistyped the new email address).
</p>
[% END %]
</div>