From ddb5db354ac1b55ce99c9d0e977a2a63099f4c21 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 23 Jul 2010 00:46:02 +0200
Subject: Bug 398701: Replace |FILTER url_quote| by |FILTER uri| r/a=mkanat

---
 .../default/global/choose-classification.html.tmpl | 12 ++++++------
 .../en/default/global/choose-product.html.tmpl     |  6 +++---
 template/en/default/global/common-links.html.tmpl  |  4 ++--
 template/en/default/global/messages.html.tmpl      |  6 +++---
 .../en/default/global/site-navigation.html.tmpl    |  6 +++---
 template/en/default/global/useful-links.html.tmpl  |  8 ++++----
 template/en/default/global/user-error.html.tmpl    | 22 +++++++++++-----------
 7 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'template/en/default/global')

diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl
index 9342d814a..fbac48479 100644
--- a/template/en/default/global/choose-classification.html.tmpl
+++ b/template/en/default/global/choose-classification.html.tmpl
@@ -31,9 +31,9 @@
 <table>
   <tr>
     <th align="right">
-      <a href="[% target FILTER url_quote %]?classification=__all
-            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
-            [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
+      <a href="[% target FILTER uri %]?classification=__all
+            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] 
+            [%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
       All</a>:
     </th>
 
@@ -46,9 +46,9 @@
 [% FOREACH class = classifications %]
   <tr>
     <th align="right">
-      <a href="[% target FILTER url_quote %]?classification=[% class.name FILTER url_quote -%]
-            [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
-            [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
+      <a href="[% target FILTER uri %]?classification=[% class.name FILTER uri -%]
+            [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] 
+            [%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
       [% class.name FILTER html %]</a>:
     </th>
 
diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index 5c9ad0916..ae00bf503 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -55,9 +55,9 @@
   [% FOREACH p = c.products %]
     <tr>
       <th align="right" valign="top">
-        <a href="[% target %]?product=[% p.name FILTER url_quote -%]
-              [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
-              [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
+        <a href="[% target %]?product=[% p.name FILTER uri -%]
+              [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] 
+              [%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
         [% p.name FILTER html FILTER no_break %]</a>:&nbsp;
       </th>
 
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index fe665df67..b0bb36315 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -47,8 +47,8 @@
     [% IF Param('shutdownhtml') || Bugzilla.has_flags %]
       <span class="separator">| </span>
       [% IF user.id %]
-        <a href="request.cgi?requester=[% user.login FILTER url_quote %]&amp;requestee=
-                 [% user.login FILTER url_quote %]&amp;do_union=1&amp;group=type&amp;action=queue">My Requests</a>
+        <a href="request.cgi?requester=[% user.login FILTER uri %]&amp;requestee=
+                 [% user.login FILTER uri %]&amp;do_union=1&amp;group=type&amp;action=queue">My Requests</a>
       [% ELSE %]
         <a href="request.cgi">Requests</a>
       [% END %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index fa0adbdf7..e464e4b08 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -129,7 +129,7 @@
   [% ELSIF message_tag == "buglist_updated_named_query" %]
     [% title = "Search updated" %]
     Your search named <code><a 
-     href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% queryname FILTER url_quote %]"
+     href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% queryname FILTER uri %]"
     >[% queryname FILTER html %]</a></code> has been updated.
 
   [% ELSIF message_tag == "buglist_new_default_query" %]
@@ -139,7 +139,7 @@
   [% ELSIF message_tag == "buglist_new_named_query" %]
     [% title = "Search created" %]
     OK, you have a new search named <code><a
-     href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% queryname FILTER url_quote %]"
+     href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% queryname FILTER uri %]"
     >[% queryname FILTER html %]</a></code>.
 
   [% ELSIF message_tag == "buglist_query_gone" %]
@@ -734,7 +734,7 @@
   [% ELSIF message_tag == "product_created" %]
     [% title = "Product Created" %]
     The product <em>[% product.name FILTER html %]</em> has been created. You will need to
-    <a href="editcomponents.cgi?action=add&product=[% product.name FILTER url_quote %]">
+    <a href="editcomponents.cgi?action=add&product=[% product.name FILTER uri %]">
     add at least one component</a> before anyone can enter [% terms.bugs %] against this product.
 
   [% ELSIF message_tag == "product_deleted" %]
diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl
index 60a8ddf96..06b0eaa92 100644
--- a/template/en/default/global/site-navigation.html.tmpl
+++ b/template/en/default/global/site-navigation.html.tmpl
@@ -55,7 +55,7 @@
 
   [%# *** Saved Searches *** %]
   [% IF user.showmybugslink %]
-    [% user_login = user.login FILTER url_quote %]
+    [% user_login = user.login FILTER uri %]
     <link rel="Saved&nbsp;Searches" title="My [% terms.Bugs %]"
           href="[% Param('mybugstemplate').replace('%userid%', user_login) %]">
   [% END %]
@@ -64,8 +64,8 @@
     <link rel="Saved&nbsp;Search"
           title="[% q.name FILTER html %] ([% q.user.login FILTER html %])"
           href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
-                 [% q.name FILTER url_quote %]&amp;sharer_id=
-                 [% q.user.id FILTER url_quote %]">
+                 [% q.name FILTER uri %]&amp;sharer_id=
+                 [% q.user.id FILTER uri %]">
   [% END %]
 
   [%# *** Bugzilla Administration Tools *** %]
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 1f1224980..dd4fed424 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -39,7 +39,7 @@
     <li id="links-saved">
       <ul class="links">
         [% IF user.showmybugslink %]
-          [% filtered_username = user.login FILTER url_quote %]
+          [% filtered_username = user.login FILTER uri %]
           <li><a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a></li>
           [% print_pipe = 1 %]
         [% END %]
@@ -47,7 +47,7 @@
         [% FOREACH q = user.queries %]
           [% IF q.link_in_footer %]
             <li>[% '<span class="separator">| </span>' IF print_pipe %]
-            <a href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER url_quote %]">[% q.name FILTER html %]</a></li>
+            <a href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER uri %]">[% q.name FILTER html %]</a></li>
             [% print_pipe = 1 %]
           [% END %]
         [% END %]
@@ -61,8 +61,8 @@
           <li>
             [% '<span class="separator">| </span>' IF print_pipe %]
             <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 %]"
+                     [% q.name FILTER uri %]&amp;sharer_id=
+                     [% q.user.id FILTER uri %]"
                class="shared"
                title="Shared by [% q.user.identity FILTER html %]"
                >[% q.name FILTER html FILTER no_break %]</a></li>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 8380f7f0c..7642a0c23 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -237,7 +237,7 @@
     You are not authorized to access [% terms.bug %] #[% bug_id FILTER html %].
     To see this [% terms.bug %], you must
     first <a href="show_bug.cgi?id=
-                   [% bug_id FILTER url_quote %]&amp;GoAheadAndLogIn=1">log
+                   [% bug_id FILTER uri %]&amp;GoAheadAndLogIn=1">log
     in to an account</a> with the appropriate permissions.
 
   [% ELSIF error == "bug_url_invalid" %]
@@ -520,7 +520,7 @@
     or disabled.
     [% IF user.in_group('tweakparams') %]
       You have to <a href="editparams.cgi?section=bugfields#
-      [%- param_name FILTER url_quote %]">change</a> the default value first.
+      [%- param_name FILTER uri %]">change</a> the default value first.
     [% END %]
 
   [% ELSIF error == "fieldvalue_name_too_long" %]
@@ -689,7 +689,7 @@
     The <em>[% group.name FILTER html %]</em> group cannot be deleted because
     there are
     <a href="editgroups.cgi?action=del&amp;group=
-             [%- group.id FILTER url_quote %]">records</a>
+             [%- group.id FILTER uri %]">records</a>
     in the database which refer to it. All references to this group must
     be removed before you can remove it.
 
@@ -1086,7 +1086,7 @@
     has to have at least one component in order for you to
     enter [% terms.abug %] into it.<br>
     [% IF user.in_group("editcomponents", product.id) %]
-      <a href="editcomponents.cgi?action=add&amp;product=[% product.name FILTER url_quote %]">Create
+      <a href="editcomponents.cgi?action=add&amp;product=[% product.name FILTER uri %]">Create
       a new component</a>.
     [% ELSE %]
       Please contact [% Param("maintainer") %] and ask them
@@ -1153,7 +1153,7 @@
     has to have at least one version in order for you to
     enter [% terms.abug %] into it.<br>
     [% IF user.in_group("editcomponents", product.id) %]
-      <a href="editversions.cgi?action=add&amp;product=[% product.name FILTER url_quote %]">Create
+      <a href="editversions.cgi?action=add&amp;product=[% product.name FILTER uri %]">Create
       a new version</a>.
     [% ELSE %]
       Please contact [% Param("maintainer") %] and ask them
@@ -1198,8 +1198,8 @@
     This will remove all [% terms.bugs %] from the
     <em>[% name FILTER html %]</em> tag. This will delete the tag completely. Click
     <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
-    [%- name FILTER url_quote %]&amp;token=
-    [%- issue_hash_token([query_id, name]) FILTER url_quote %]">here</a>
+    [%- name FILTER uri %]&amp;token=
+    [%- issue_hash_token([query_id, name]) FILTER uri %]">here</a>
     if you really want to delete it.
 
   [% ELSIF error == "no_bugs_to_remove" %]
@@ -1327,7 +1327,7 @@
     [% title = "Must define new default milestone" %]
     [% admindocslinks = {'products.html' => 'Administering products',
                          'milestones.html' => 'About Milestones'} %]
-    You must <a href="editmilestones.cgi?action=add&amp;product=[% product FILTER url_quote %]">
+    You must <a href="editmilestones.cgi?action=add&amp;product=[% product FILTER uri %]">
     create the milestone '[% milestone FILTER html %]'</a> before
     it can be made the default milestone for product '[% product FILTER html %]'.
 
@@ -1376,8 +1376,8 @@
     The name <em>[% name FILTER html %]</em> is already used by another
     saved search. You first have to
     <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
-    [%- name FILTER url_quote %]&amp;token=
-    [% issue_hash_token([query_id, name]) FILTER url_quote %]">delete</a>
+    [%- name FILTER uri %]&amp;token=
+    [% issue_hash_token([query_id, name]) FILTER uri %]">delete</a>
     it if you really want to use this name.
 
   [% ELSIF error == "query_name_missing" %]
@@ -1707,7 +1707,7 @@
   <p>  
     Alternatively, you can    
     <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
-                  [% namedcmd FILTER url_quote %]">forget</a>
+                  [% namedcmd FILTER uri %]">forget</a>
                   
     [% FOREACH q = Bugzilla.user.queries %]
       [% IF q.name == namedcmd %]
-- 
cgit v1.2.3-24-g4f1b