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

r/a=mkanat

4 files changed, 13 insertions, 13 deletions

diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index cbeb72cf8..31591ec5a 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -35,7 +35,7 @@
   [% title = title _ ": " _ (searchname OR defaultsavename) FILTER html %]
 [% END %]
 
-[% qorder = order FILTER url_quote IF order %]
+[% qorder = order FILTER uri IF order %]
 
 
 [%############################################################################%]
@@ -212,7 +212,7 @@
         [% urlquerypart FILTER html %]&amp;ctype=ics">iCalendar</a> |
         <a href="colchange.cgi?
         [% urlquerypart FILTER html %]&amp;query_based_on=
-          [% defaultsavename OR searchname FILTER url_quote %]">Change&nbsp;Columns</a> |
+          [% defaultsavename OR searchname FILTER uri %]">Change&nbsp;Columns</a> |
 
         [% IF bugs.size > 1 && caneditbugs && !dotweak %]
           <a href="buglist.cgi?[% urlquerypart FILTER html %]
@@ -239,8 +239,8 @@
       <td valign="middle" nowrap="nowrap" class="bz_query_forget">
         |
         <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
-                [% searchname FILTER url_quote %]&amp;token=
-                [% issue_hash_token([search_id, searchname]) FILTER url_quote %]">
+                [% searchname FILTER uri %]&amp;token=
+                [% issue_hash_token([search_id, searchname]) FILTER uri %]">
           Forget&nbsp;Search&nbsp;'[% searchname FILTER html %]'</a>
       </td>
     [% ELSE %]
@@ -277,14 +277,14 @@
   [% editqueryname = searchname OR defaultsavename OR '' %]
   query.cgi?[% urlquerypart FILTER html %]
     [%- IF editqueryname != '' %]&amp;known_name=
-      [%- editqueryname FILTER url_quote %]
+      [%- editqueryname FILTER uri %]
     [% END %]
 [% END %]
 
 [% BLOCK enter_bug_link %]
   <a href="enter_bug.cgi
            [%- IF one_product.defined %]?product=
-             [%- one_product.name FILTER url_quote %][% END %]">File
+             [%- one_product.name FILTER uri %][% END %]">File
     a new [% terms.bug %]
    [% IF one_product.defined %]
      in the "[% one_product.name FILTER html %]" product
diff --git a/template/en/default/list/list.ics.tmpl b/template/en/default/list/list.ics.tmpl
index b135267f4..54e8d0618 100644
--- a/template/en/default/list/list.ics.tmpl
+++ b/template/en/default/list/list.ics.tmpl
@@ -58,11 +58,11 @@ END:VCALENDAR
 [% END %]
 
 [% BLOCK ics_uid %]
-  [% "${bug_id}@${base_url}" FILTER url_quote FILTER ics('UID') %]
+  [% "${bug_id}@${base_url}" FILTER uri FILTER ics('UID') %]
 [% END %]
 
 [% BLOCK ics_url %]
-  [% "${base_url}show_bug.cgi?id=${bug_id}" FILTER url_quote FILTER ics('URL;VALUE=URI') %]
+  [% "${base_url}show_bug.cgi?id=${bug_id}" FILTER uri FILTER ics('URL;VALUE=URI') %]
 [% END %]
 
 [% BLOCK ics_dtstart %]
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index 1404b2e35..1870ffcf2 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -119,7 +119,7 @@
               [% "Unknown" IF NOT users.$userid %]
             </td>
             <td>
-              <a href="quips.cgi?action=delete&amp;quipid=[% quipid FILTER url_quote %]">
+              <a href="quips.cgi?action=delete&amp;quipid=[% quipid FILTER uri %]">
                 Delete
               </a>
             </td>
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 7e6eb5b99..789d4c42e 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -87,7 +87,7 @@
                   [% urlquerypart FILTER html %]&amp;order=
                   [% PROCESS new_order id='bug_id' %]
                   [%-#%]&amp;query_based_on=
-                  [% defaultsavename OR searchname FILTER url_quote %]">ID
+                  [% defaultsavename OR searchname FILTER uri %]">ID
           [% PROCESS order_arrow id='bug_id' ~%]
         </a>
       </th>
@@ -129,7 +129,7 @@
     <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;order=
       [% PROCESS new_order %]
       [%-#%]&amp;query_based_on=
-      [% defaultsavename OR searchname FILTER url_quote %]">
+      [% defaultsavename OR searchname FILTER uri %]">
         [%- abbrev.$id.title || field_descs.$id || column.title -%]
         [% PROCESS order_arrow ~%]
     </a>
@@ -141,9 +141,9 @@
   [% IF (om = order.match("\\b$id( DESC)?")) %]
     [% desc = ' DESC' IF NOT om.0 %]
   [% END %]
-  [% id _ desc FILTER url_quote %]
+  [% id _ desc FILTER uri %]
   [% IF id != 'bug_id' AND order %]
-    [% ',' _ order.remove("\\b$id( DESC)?(,\\s*|\$)") FILTER url_quote %]
+    [% ',' _ order.remove("\\b$id( DESC)?(,\\s*|\$)") FILTER uri %]
   [% END %]
 [% END %]