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

r/a=mkanat

6 files changed, 18 insertions, 18 deletions

diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 86bdb8621..93cd18a77 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -82,7 +82,7 @@ function PutDescription() {
 [% ELSIF product.name == "Thunderbird" %]
   [% productstring = "product=Mozilla%20Application%20Suite&product=Thunderbird" %]
 [% ELSE %]
-  [% productstring = BLOCK %]product=[% product.name FILTER url_quote %][% END %]
+  [% productstring = BLOCK %]product=[% product.name FILTER uri %][% END %]
 [% END %]
 
 <p>
@@ -205,7 +205,7 @@ function PutDescription() {
         To pick the right component, you could use the same one as
         similar [% terms.bugs %] you found in your search, or read the full list of
         <a target="_blank" href="describecomponents.cgi?product=
-            [% product.name FILTER url_quote %]">component
+            [% product.name FILTER uri %]">component
         descriptions</a> (opens in new window) if you need more help.
       </p>
     </td>
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 425d82343..f79249946 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -221,7 +221,7 @@ TUI_hide_default('attachment_text_field');
   [%# We can't use the select block in these two cases for various reasons. %]
   <tr>
     [% component_desc_url = BLOCK -%]
-      describecomponents.cgi?product=[% product.name FILTER url_quote %]
+      describecomponents.cgi?product=[% product.name FILTER uri %]
     [% END %]
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.component editable = 1
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 627c89d60..6ae183f1f 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -144,7 +144,7 @@
       <span class="summ_text">[%+ bug.short_desc FILTER html %]</span>
       <span class="summ_info">[[% INCLUDE buginfo %]]</span>
     </a>
-    <a href="showdependencytree.cgi?id=[% bugid FILTER url_quote %]"
+    <a href="showdependencytree.cgi?id=[% bugid FILTER uri %]"
        class="tree_link">
       <img src="skins/standard/dependency-tree/tree.png"
            title="See dependency tree for [% terms.bug %] [%+ bugid FILTER html %]">
diff --git a/template/en/default/bug/field-label.html.tmpl b/template/en/default/bug/field-label.html.tmpl
index 0b794f82a..a47855e14 100644
--- a/template/en/default/bug/field-label.html.tmpl
+++ b/template/en/default/bug/field-label.html.tmpl
@@ -45,7 +45,7 @@
     [% IF desc_url %]
       href="[% desc_url FILTER html %]"
     [% ELSE %]
-      href="page.cgi?id=fields.html#[% field.name FILTER url_quote %]"
+      href="page.cgi?id=fields.html#[% field.name FILTER uri %]"
     [% END %]
   >[%- field_descs.${field.name} FILTER html %]:</a>
 
diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index 19af18ade..46b92aec4 100644
--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -25,11 +25,11 @@
 [% IF bottom_navigator == 1 %]
   <ul class="related_actions">
     <li><a href="show_bug.cgi?format=multiple&amp;id=
-                [% bug.bug_id FILTER url_quote %]">Format For Printing</a></li>
+                [% bug.bug_id FILTER uri %]">Format For Printing</a></li>
     <li>&nbsp;-&nbsp;<a href="show_bug.cgi?ctype=xml&amp;id=
-                        [% bug.bug_id  FILTER url_quote %]">XML</a></li>
+                        [% bug.bug_id  FILTER uri %]">XML</a></li>
     <li>&nbsp;-&nbsp;<a href="enter_bug.cgi?cloned_bug_id=
-                        [% bug.bug_id  FILTER url_quote %]">Clone This 
+                        [% bug.bug_id  FILTER uri %]">Clone This 
                         [% terms.Bug %]</a></li>
     [%# Links to more things users can do with this bug. %]
     [% Hook.process("links") %]
@@ -48,17 +48,17 @@
   ([% this_bug_idx + 1 %] of [% last_bug_list.size %])
 
   <a href="show_bug.cgi?id=
-           [%- last_bug_list.first FILTER url_quote %]&amp;list_id=
-           [%- my_search.id FILTER url_quote %]">First</a>
+           [%- last_bug_list.first FILTER uri %]&amp;list_id=
+           [%- my_search.id FILTER uri %]">First</a>
   <a href="show_bug.cgi?id=
-           [%- last_bug_list.last FILTER url_quote %]&amp;list_id=
-           [%- my_search.id FILTER url_quote %]">Last</a>
+           [%- last_bug_list.last FILTER uri %]&amp;list_id=
+           [%- my_search.id FILTER uri %]">Last</a>
 
   [% IF this_bug_idx > 0 %]
     [% prev_bug = this_bug_idx - 1 %]
     <a href="show_bug.cgi?id=
-             [%- last_bug_list.$prev_bug FILTER url_quote %]&amp;list_id=
-             [%- my_search.id FILTER url_quote %]">Prev</a>
+             [%- last_bug_list.$prev_bug FILTER uri %]&amp;list_id=
+             [%- my_search.id FILTER uri %]">Prev</a>
   [% ELSE %]
     <i><font color="#777777">Prev</font></i>
   [% END %]
@@ -66,14 +66,14 @@
   [% IF this_bug_idx + 1 < last_bug_list.size %]
     [% next_bug = this_bug_idx + 1 %]
     <a href="show_bug.cgi?id=
-             [%- last_bug_list.$next_bug FILTER url_quote %]&amp;list_id=
-             [%- my_search.id FILTER url_quote %]">Next</a>
+             [%- last_bug_list.$next_bug FILTER uri %]&amp;list_id=
+             [%- my_search.id FILTER uri %]">Next</a>
   [% ELSE %]
     <i><font color="#777777">Next</font></i>
   [% END %]
 
   &nbsp;&nbsp;<a href="buglist.cgi?regetlastlist=
-              [%- my_search.id FILTER url_quote %]">Show last search results</a>
+              [%- my_search.id FILTER uri %]">Show last search results</a>
 [% ELSE %]
   [%# With no list, don't show link to search results %]
   <i><font color="#777777">First</font></i>
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 0949ffc20..56f732667 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -66,7 +66,7 @@
     [% terms.Bug %] 
     <a href="show_bug.cgi?id=[% bug.bug_id FILTER html %]">[% bug.bug_id FILTER html %]</a>
     [% IF Param("usebugaliases") AND bug.alias AND NOT bug.error %]
-      (<a href="show_bug.cgi?id=[% bug.alias FILTER url_quote %]">
+      (<a href="show_bug.cgi?id=[% bug.alias FILTER uri %]">
         [% bug.alias FILTER html %]</a>)
     [% END %]
   </h1>