From 9ea0e39492ab2c9396ac7525a6a6e5e54b54b6ce Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <lpsolit%gmail.com>
Date: Fri, 18 Aug 2006 17:43:41 +0000
Subject: [PATCH] Bug 252856: HTML charts don't validate - Patch by
 victory(_RSZ_) <bmo@rsz.jp> r=gerv a=myk

---
 webtools/bugzilla/template/en/default/filterexceptions.pl  | 1 -
 .../template/en/default/reports/report-table.html.tmpl     | 5 ++---
 .../bugzilla/template/en/default/reports/report.html.tmpl  | 7 ++++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/webtools/bugzilla/template/en/default/filterexceptions.pl b/webtools/bugzilla/template/en/default/filterexceptions.pl
index 062408a090a8..2723b8dd9dcb 100644
--- a/webtools/bugzilla/template/en/default/filterexceptions.pl
+++ b/webtools/bugzilla/template/en/default/filterexceptions.pl
@@ -123,7 +123,6 @@
 ],
 
 'reports/report-table.html.tmpl' => [
-  'buglistbase', 
   '"&amp;$tbl_vals" IF tbl_vals', 
   '"&amp;$col_vals" IF col_vals', 
   '"&amp;$row_vals" IF row_vals', 
diff --git a/webtools/bugzilla/template/en/default/reports/report-table.html.tmpl b/webtools/bugzilla/template/en/default/reports/report-table.html.tmpl
index 679eb1c1dd9b..60965d502110 100644
--- a/webtools/bugzilla/template/en/default/reports/report-table.html.tmpl
+++ b/webtools/bugzilla/template/en/default/reports/report-table.html.tmpl
@@ -37,10 +37,10 @@
 [% row_field_disp = field_descs.$row_field || row_field %]
   
 [% IF tbl == "-total-" %]
-  [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %]
+  [% urlbase = BLOCK %]buglist.cgi?[% buglistbase FILTER html %]
   [% "&amp;$tbl_vals" IF tbl_vals %][% END %]
 [% ELSE %]
-  [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %]&amp;
+  [% urlbase = BLOCK %]buglist.cgi?[% buglistbase FILTER html %]&amp;
   [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %][% END %]
 [% END %]
 
@@ -154,7 +154,6 @@
           [% col_field FILTER url_quote %]=[% col FILTER url_quote %]
           [% "&amp;$row_vals" IF row_vals %]">
         [% col_totals.$col %]</a>
-      <strong>
       </td> 
     [% END %]
     <td class="ttotal" align="right">
diff --git a/webtools/bugzilla/template/en/default/reports/report.html.tmpl b/webtools/bugzilla/template/en/default/reports/report.html.tmpl
index 29157842f730..cf4dda8277d0 100644
--- a/webtools/bugzilla/template/en/default/reports/report.html.tmpl
+++ b/webtools/bugzilla/template/en/default/reports/report.html.tmpl
@@ -51,6 +51,7 @@
 [% tbl_field_disp = field_descs.$tbl_field || tbl_field %]
 [% col_field_disp = field_descs.$col_field || col_field %]
 [% row_field_disp = field_descs.$row_field || row_field %]
+[% switchbase     = switchbase FILTER html %]
 
 [% title = BLOCK %]
   Report: 
@@ -125,8 +126,8 @@
                        { name => "line",  description => "Line" },
                        { name => "table", description => "Table" } ] %]
 
-        [% formaturl = "report.cgi?$switchbase&width=$width&height=$height" _ 
-                       "&action=wrap" %]
+        [% formaturl = "report.cgi?$switchbase&amp;width=$width" _ 
+                       "&amp;height=$height&amp;action=wrap" %]
         [% FOREACH other_format = formats %]
           [% NEXT IF other_format.name == "pie" AND row_field AND col_field %]
           [% UNLESS other_format.name == format %]
@@ -157,7 +158,7 @@
                    [% height - 100 %]">Shorter</a><br>
         </td>
       [% END %]
-    <tr>
+    </tr>
   </table>
 
   <p>