Bug 398701: Replace |FILTER url_quote| by |FILTER uri|

r/a=mkanat

6 files changed, 17 insertions, 17 deletions

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 @@
     <tr>
       <td>My [% terms.Bugs %]</td>
       <td>
-        [% filtered_username = user.login FILTER url_quote %]
+        [% filtered_username = user.login FILTER uri %]
         <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">Run</a>
       </td>
       <td>
@@ -96,20 +96,20 @@
       <tr>
         <td>[% q.name FILTER html %]</td>
         <td>
-          <a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=[% q.name FILTER url_quote %]
-                   [% IF q.shared_with_group.id %]&amp;sharer_id=[% user.id FILTER url_quote %][% END %]">Run</a>
+          <a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=[% q.name FILTER uri %]
+                   [% IF q.shared_with_group.id %]&amp;sharer_id=[% user.id FILTER uri %][% END %]">Run</a>
         </td>
         <td>
           <a href="query.cgi?[% q.edit_link FILTER html %]&amp;known_name=
-                   [% q.name FILTER url_quote %]">Edit</a>
+                   [% q.name FILTER uri %]">Edit</a>
         </td>
         <td>
           [% IF q.used_in_whine %]
             Remove from <a href="editwhines.cgi">whining</a> first
           [% ELSE %]
             <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
-                     [% q.name FILTER url_quote %]&amp;token=
-                     [% issue_hash_token([q.id, q.name]) FILTER url_quote %]">Forget</a>
+                     [% q.name FILTER uri %]&amp;token=
+                     [% issue_hash_token([q.id, q.name]) FILTER uri %]">Forget</a>
           [% END %]
         </td>
         <td align="center">
@@ -187,12 +187,12 @@
         <td>[% q.shared_with_group.name FILTER html %]</td>
         <td>
           <a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
-                   [% q.name FILTER url_quote %]&amp;sharer_id=
-                   [% q.user.id FILTER url_quote %]">Run</a>
+                   [% q.name FILTER uri %]&amp;sharer_id=
+                   [% q.user.id FILTER uri %]">Run</a>
         </td>
         <td>
           <a href="query.cgi?[% q.edit_link FILTER html %]&amp;known_name=
-                   [% q.name FILTER url_quote %]">Edit</a>
+                   [% q.name FILTER uri %]">Edit</a>
         </td>
         <td align="center">
           <input type="checkbox" 
diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl
index c6fd45c65..ee00875fe 100644
--- a/template/en/default/account/profile-activity.html.tmpl
+++ b/template/en/default/account/profile-activity.html.tmpl
@@ -73,7 +73,7 @@
 %]
 
 <p><a href="editusers.cgi?action=edit&amp;userid=
-  [%- otheruser.id FILTER url_quote %]"
+  [%- otheruser.id FILTER uri %]"
   title="Edit user '[% otheruser.login FILTER html %]'">Edit this user</a> or
   <a title="Search For Users" href="editusers.cgi">search for other accounts</a>
   [% IF listselectionvalues.matchtype != 'exact' %]