Bug 305807: Fix some incorrect template filtering types - Patch by GavinS <bugzilla@chimpychompy.org> r=LpSolit r=justdave a=justdave

7 files changed, 10 insertions, 10 deletions

diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl
index b38f4d6aa..24ec9dacf 100644
--- a/template/en/default/admin/classifications/edit.html.tmpl
+++ b/template/en/default/admin/classifications/edit.html.tmpl
@@ -49,7 +49,7 @@
                 <th align=right valign=top>[% product.name FILTER html %]</th>
                 <td valign=top>
                   [% IF product.description %]
-                    [% product.description FILTER html %]
+                    [% product.description FILTER none %]
                   [% ELSE %]
                     <font color="red">description missing</font>
                   [% END %]
diff --git a/template/en/default/admin/groups/deleted.html.tmpl b/template/en/default/admin/groups/deleted.html.tmpl
index fc91190cb..2a5c2f870 100644
--- a/template/en/default/admin/groups/deleted.html.tmpl
+++ b/template/en/default/admin/groups/deleted.html.tmpl
@@ -42,7 +42,7 @@
   </p>
 
   <p>
-    <a href="editgroups.cgi?action=del&amp;group=[% gid FILTER html %]">View</a>
+    <a href="editgroups.cgi?action=del&amp;group=[% gid FILTER url_quote %]">View</a>
     the list of which records are affected.
   </p>
 [% ELSE %]
diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl
index c183e4aff..5c473216c 100644
--- a/template/en/default/admin/groups/list.html.tmpl
+++ b/template/en/default/admin/groups/list.html.tmpl
@@ -67,9 +67,9 @@
       </td>
 
       <td align="center" valign="middle">
-        <a href="editgroups.cgi?action=changeform&amp;group=[% group.id FILTER html %]">Edit</a>
+        <a href="editgroups.cgi?action=changeform&amp;group=[% group.id FILTER url_quote %]">Edit</a>
         [% IF (group.isbuggroup) %]
-          | <a href="editgroups.cgi?action=del&amp;group=[% group.id FILTER html %]">Delete</a>
+          | <a href="editgroups.cgi?action=del&amp;group=[% group.id FILTER url_quote %]">Delete</a>
         [% END %]
       </td>
     </tr>
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index 61d7c14ec..d26b274ef 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -243,7 +243,7 @@ tbody.file pre:empty {
   [% IF headers %]
     <a href="[% PROCESS viewurl id=attachid %]">View</a>
     | <a href="[% PROCESS editurl id=attachid %]">Edit</a>
-    | <a href="[% PROCESS diffurl id=attachid %]&amp;context=[% context FILTER html %]&amp;collapsed=[% collapsed FILTER html %]&amp;headers=[% headers FILTER html %]&amp;format=raw">Raw&nbsp;Unified</a>
+    | <a href="[% PROCESS diffurl id=attachid %]&amp;context=[% context FILTER url_quote %]&amp;collapsed=[% collapsed FILTER url_quote %]&amp;headers=[% headers FILTER url_quote %]&amp;format=raw">Raw&nbsp;Unified</a>
   [% END %]
   [% IF other_patches.size > 0 %]
     [% IF headers %] |[%END%]
@@ -287,12 +287,12 @@ tbody.file pre:empty {
   [% IF context == "patch" %]
     (<strong>Patch</strong> / 
   [% ELSE %]
-    (<a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER html %]">Patch</a> / 
+    (<a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER url_quote %]">Patch</a> / 
   [% END %]
   [% IF context == "file" %]
     <strong>File</strong> /
   [% ELSE %]
-    <a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER html %]&amp;context=file">File</a> / 
+    <a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER url_quote %]&amp;context=file">File</a> / 
   [% END %]
 
   [% IF context == "patch" || context == "file" %]
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index 0bcaeaeb6..c16f6d429 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -324,6 +324,6 @@
   #%]
 
 [% BLOCK buglink %]
-    <a href="show_bug.cgi?id=[% id FILTER html %]"><b>[% terms.Bug %]&nbsp;[% id FILTER html %]</b></a>
+    <a href="show_bug.cgi?id=[% id FILTER url_quote %]"><b>[% terms.Bug %]&nbsp;[% id FILTER html %]</b></a>
 [% END %]
 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 4de46f958..8646100da 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1276,7 +1276,7 @@
   <p>  
     Alternatively, you can    
     <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
-                  [% namedcmd FILTER html %]">forget</a>
+                  [% namedcmd FILTER url_quote %]">forget</a>
                   
     [% FOREACH q = Bugzilla.user.queries %]
       [% IF q.name == namedcmd %]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index dfe57b755..48b60ac8a 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -168,7 +168,7 @@
         [% urlquerypart FILTER html %]&amp;ctype=ics">iCalendar</a> |
         <a href="colchange.cgi?
         [% urlquerypart FILTER html %]&amp;query_based_on=
-          [% defaultsavename OR searchname FILTER html %]">Change&nbsp;Columns</a> |
+          [% defaultsavename OR searchname FILTER url_quote %]">Change&nbsp;Columns</a> |
 
         [% IF bugs.size > 1 && caneditbugs && !dotweak %]
           <a href="buglist.cgi?[% urlquerypart FILTER html %]