summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorgerv%gerv.net <>2004-04-07 16:24:33 +0200
committergerv%gerv.net <>2004-04-07 16:24:33 +0200
commit3a5a32987a8028971c12549cc7fadca51dd009cb (patch)
tree55b3fe6378aea8be91012d7bb51fb4379d90fbb2 /template/en
parent94aa1c3524aaf33ba6bfefe576289927f6f9b083 (diff)
downloadbugzilla-3a5a32987a8028971c12549cc7fadca51dd009cb.tar.gz
bugzilla-3a5a32987a8028971c12549cc7fadca51dd009cb.tar.xz
Bug 192775 - rearrange parameter order in token URLs to make them always fully linked in some MUAs. Patch by gerv; r=myk, a=justdave.
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/password/forgotten-password.txt.tmpl4
3 files changed, 5 insertions, 5 deletions
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index 8841891f3..7113504d8 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -31,12 +31,12 @@ for the account [% oldemailaddress %] to your address.
To confirm the change, visit the following link:
-[%+ Param('urlbase') %]token.cgi?a=cfmem&t=[% token FILTER url_quote %]
+[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cfmem
If you are not the person who made this request, or you wish to cancel
this request, visit the following link:
-[%+ Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %]
+[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem
If you do nothing, the request will lapse after [%+ max_token_age %] days
(at precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index 323f71373..272f6d4e5 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -40,7 +40,7 @@ for your account to [%+ newemailaddress %].
If you are not the person who made this request, or you wish to cancel
this request, visit the following link:
-[%+ Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %]
+[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem
If you do nothing, and [%+ newemailaddress %] confirms this request, the
change will be made permanent after [%+ max_token_age %] days (at precisely
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl
index b5e156231..5ac3ed75c 100644
--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.txt.tmpl
@@ -29,12 +29,12 @@ Subject: [% terms.Bugzilla %] Change Password Request
You have (or someone impersonating you has) requested to change your
[%+ terms.Bugzilla %] password. To complete the change, visit the following link:
-[%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% token FILTER url_quote %]
+[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cfmpw
If you are not the person who made this request, or you wish to cancel
this request, visit the following link:
-[%+ Param('urlbase') %]token.cgi?a=cxlpw&t=[% token FILTER url_quote %]
+[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlpw
If you do nothing, the request will lapse after [%+ max_token_age +%] days (at
precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you