From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 27 Aug 2010 19:53:10 +0000 (+0200)
Subject: Bug 398701: Replace |FILTER url_quote| by |FILTER uri|, including extensions/Voting
X-Git-Tag: bugzilla-4.1.1~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e244627ee131c348f6ca7e821ca64b6aa2119ac9;p=thirdparty%2Fbugzilla.git

Bug 398701: Replace |FILTER url_quote| by |FILTER uri|, including extensions/Voting
r/a=mkanat
---

diff --git a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
index 139fc641bd..af2b1c1028 100644
--- a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
@@ -59,7 +59,7 @@
   [% IF changes.too_many_votes.size %]
     [% FOREACH detail = changes.too_many_votes %]
       &rarr;removed votes for [% terms.bug %] <a href="show_bug.cgi?id=
-     [%- detail.id FILTER url_quote %]">
+     [%- detail.id FILTER uri %]">
      [%- detail.id FILTER html %]</a> from [% detail.name FILTER html %]<br>
     [% END %]
   [% ELSE %]
@@ -72,7 +72,7 @@
   [% IF changes.too_many_total_votes.size %]
     [% FOREACH detail = changes.too_many_total_votes %]
       &rarr;removed votes for [% terms.bug %] <a href="show_bug.cgi?id=
-     [%- detail.id FILTER url_quote %]">
+     [%- detail.id FILTER uri %]">
      [%- detail.id FILTER html %]</a> from [% detail.name FILTER html %]<br>
     [% END %]
   [% ELSE %]
diff --git a/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl b/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl
index 606f981ee7..fea82601a8 100644
--- a/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl
@@ -26,7 +26,7 @@
     [% IF bug.votes %]
       with
       <a href="page.cgi?id=voting/bug.html&amp;bug_id=
-               [%- bug.id FILTER url_quote %]">
+               [%- bug.id FILTER uri %]">
         [%- bug.votes %] 
         [% IF bug.votes == 1 %]
             vote
@@ -35,7 +35,7 @@
         [% END %]</a>
     [% END %]
     (<a href="page.cgi?id=voting/user.html&amp;bug_id=
-              [%- bug.id FILTER url_quote %]#vote_
-              [%- bug.id FILTER url_quote %]">vote</a>)
+              [%- bug.id FILTER uri %]#vote_
+              [%- bug.id FILTER uri %]">vote</a>)
   </span>
 [% END %]
diff --git a/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl b/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
index 03434a5053..0aa7072b74 100644
--- a/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
@@ -45,7 +45,7 @@
     <tr>
       <td>
           <a href="page.cgi?id=voting/user.html&amp;user_id=
-                  [%- voter.id FILTER url_quote %]">
+                  [%- voter.id FILTER uri %]">
           [% voter.login_name FILTER email FILTER html %]
         </a>
       </td>
diff --git a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
index 8000792243..f2ac160f85 100644
--- a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
@@ -93,7 +93,7 @@
         <tr>
           <th>[% product.name FILTER html %]</th>
           <td colspan="2" ><a href="buglist.cgi?bug_id=
-              [%- product.bug_ids.join(",") FILTER url_quote %]">([% terms.bug %] list)</a>
+              [%- product.bug_ids.join(",") FILTER uri %]">([% terms.bug %] list)</a>
           </td>
           <td>
             [% IF product.maxperbug < product.maxvotes AND
@@ -149,7 +149,7 @@
 
     [% IF canedit %]
       <input type="submit" value="Change My Votes" id="change"> or 
-      <a href="buglist.cgi?bug_id=[% all_bug_ids.join(",") FILTER url_quote %]">view all
+      <a href="buglist.cgi?bug_id=[% all_bug_ids.join(",") FILTER uri %]">view all
         as [% terms.bug %] list</a>
       <br>
       <br>
@@ -163,7 +163,7 @@
       [% END %]
       and then click <b>Change My Votes</b>.
     [% ELSE %]
-       <a href="buglist.cgi?bug_id=[% all_bug_ids.join(",") FILTER url_quote %]">View all
+       <a href="buglist.cgi?bug_id=[% all_bug_ids.join(",") FILTER uri %]">View all
          as [% terms.bug %] list</a>
     [% END %]
   </form>