Bug 192775 - rearrange parameter order in token URLs to make them always fully linked...

diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index 8841891f3796dbe1e2958a9a8a0e8077cc5f0782..7113504d8a17a01c8d4e16879075fa5dbb288f70 100644 (file)
--- 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 323f71373064e5c608b93427c09185ce891fb060..272f6d4e525975dd0b1bf392f3b14f7449d6ff3e 100644 (file)
--- 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 b5e15623155041d1963f9a02f868bc85e7ff108f..5ac3ed75c9ffba3524e40ca131bd68dae11ff75a 100644 (file)
--- 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