From ddb5db354ac1b55ce99c9d0e977a2a63099f4c21 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Fri, 23 Jul 2010 00:46:02 +0200 Subject: Bug 398701: Replace |FILTER url_quote| by |FILTER uri| r/a=mkanat --- template/en/default/account/email/change-new.txt.tmpl | 4 ++-- template/en/default/account/email/change-old.txt.tmpl | 2 +- template/en/default/account/email/request-new.txt.tmpl | 4 ++-- .../account/password/forgotten-password.txt.tmpl | 4 ++-- .../en/default/account/prefs/saved-searches.html.tmpl | 18 +++++++++--------- template/en/default/account/profile-activity.html.tmpl | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'template/en/default/account') diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index 5803b0274..b40ab9852 100644 --- a/template/en/default/account/email/change-new.txt.tmpl +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -30,12 +30,12 @@ for the account [% oldemailaddress %] to your address. To confirm the change, visit the following link: -[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cfmem +[%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cfmem If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem +[%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cxlem If you do nothing, the request will lapse after [% constants.MAX_TOKEN_AGE %] days (on [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]). diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl index 6b7774420..ee66c0f24 100644 --- a/template/en/default/account/email/change-old.txt.tmpl +++ b/template/en/default/account/email/change-old.txt.tmpl @@ -39,7 +39,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: -[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem +[%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cxlem If you do nothing, and [%+ newemailaddress %] confirms this request, the change will be made permanent after [% constants.MAX_TOKEN_AGE %] days diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index c56054b94..8fb36926f 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -32,7 +32,7 @@ using your email address ([% email %]). To continue creating an account using this email address, visit the following link by [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]: -[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=request_new_account +[%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=request_new_account If you did not receive this email before [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %] or you wish to create an account using a different email address you can begin @@ -50,7 +50,7 @@ Hotmail, or similar) to avoid receiving spam at your primary email address. If you do not wish to create an account, or if this request was made in error you can do nothing or visit the following link: -[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cancel_new_account +[%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cancel_new_account If the above links do not work, or you have any other issues regarding your account, please contact administration at [% Param('maintainer') %]. diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index 574975c85..e014658dc 100644 --- a/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/template/en/default/account/password/forgotten-password.txt.tmpl @@ -28,12 +28,12 @@ X-Bugzilla-Type: admin You have (or someone impersonating you has) requested to change your [%+ terms.Bugzilla %] password. To complete the change, visit the following link: -[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cfmpw +[%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cfmpw If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cxlpw +[%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cxlpw If you do nothing, the request will lapse after [% constants.MAX_TOKEN_AGE %] days (on [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z", timezone) %]) or when you diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index f1286134b..3cbc05abe 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -71,7 +71,7 @@ My [% terms.Bugs %] - [% filtered_username = user.login FILTER url_quote %] + [% filtered_username = user.login FILTER uri %] Run @@ -96,20 +96,20 @@ [% q.name FILTER html %] - Run + Run Edit + [% q.name FILTER uri %]">Edit [% IF q.used_in_whine %] Remove from whining first [% ELSE %] Forget + [% q.name FILTER uri %]&token= + [% issue_hash_token([q.id, q.name]) FILTER uri %]">Forget [% END %] @@ -187,12 +187,12 @@ [% q.shared_with_group.name FILTER html %] Run + [% q.name FILTER uri %]&sharer_id= + [% q.user.id FILTER uri %]">Run Edit + [% q.name FILTER uri %]">Edit Edit this user or search for other accounts [% IF listselectionvalues.matchtype != 'exact' %] -- cgit v1.2.3-24-g4f1b