From 818ce46d9780c7a04ac04a3f116021f1edadd476 Mon Sep 17 00:00:00 2001
From: "bbaetz%student.usyd.edu.au" <>
Date: Sat, 26 Oct 2002 08:56:55 +0000
Subject: Bug 147833 - start using CGI.pm r=gerv, justdave

---
 template/en/default/global/code-error.html.tmpl    |  7 ++++++-
 template/en/default/reports/report-table.html.tmpl | 13 +++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 1ec1c4626..baad2f5f0 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -47,6 +47,11 @@
   [% ELSIF error == "attachment_already_obsolete" %]
     Attachment #[% attachid FILTER html %] ([% description FILTER html %]) 
     is already obsolete.
+
+  [% ELSIF error == "cgi_error" %]
+    [% title = "CGI Error" %]
+    Bugzilla has had trouble interpreting your CGI request;
+    [%+ Param('browserbugmessage') %]
     
   [% ELSIF error == "chart_data_not_generated" %]
     The tool which gathers bug counts has not been run yet.
@@ -236,7 +241,7 @@
   <pre>
 Variables:
   [% FOREACH key = variables.keys %]
-    [%+ key %]: [%+ variables.$key %]
+    [%+ key FILTER html %]: [%+ variables.$key FILTER html %]
   [% END %]
   </pre>
 [% END %]
diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 97dae5b48..9767f5030 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -21,7 +21,8 @@
   #%]
 
 [%# INTERFACE:
-  # basequery: The base query for this table, in URL form
+  # querybase: The base query for this table, in URL form
+  # query: The query for this table, in URL form
   # data: hash of hash of hash of numbers. Bug counts.
   # names: hash of hash of strings. Names of tables, rows and columns.
   # col_field: string. Name of the field being plotted as columns.
@@ -149,7 +150,7 @@
         [% col_idx = 1 - col_idx %]
         <td class="[% classes.$row_idx.$col_idx %]" align="center">
           [% IF data.$tbl.$col.$row AND data.$tbl.$col.$row > 0 %]
-            <a href="buglist.cgi?[% buglistbase %]&
+            <a href="buglist.cgi?[% querybase FILTER html %]&amp;
               [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]&amp;
               [% row_field FILTER url_quote %]=[% row FILTER url_quote %]&amp;
               [% col_field FILTER url_quote %]=[% col FILTER url_quote %]">
@@ -160,7 +161,7 @@
         </td>
       [% END %] 
       <td class="ttotal" align="right">
-        <a href="buglist.cgi?[% buglistbase %]&
+        <a href="buglist.cgi?[% querybase FILTER html %]&amp;
           [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]&amp;
           [% row_field FILTER url_quote %]=[% row FILTER url_quote %]">
         [% row_total %]</a>
@@ -178,7 +179,7 @@
       [% NEXT IF col == "" %]
       
       <td class="ttotal" align="center">
-        <a href="buglist.cgi?[% buglistbase %]&
+        <a href="buglist.cgi?[% querybase FILTER html %]&amp;
           [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]&amp;
           [% col_field FILTER url_quote %]=[% col FILTER url_quote %]">
         [% col_totals.$col %]</a>
@@ -187,7 +188,7 @@
     [% END %]
     <td class="ttotal" align="right">
       <strong>
-        <a href="buglist.cgi?[% buglistbase %]">[% grand_total %]</a>
+        <a href="buglist.cgi?[% querybase FILTER html %]">[% grand_total %]</a>
       </strong>
     </td>
   </tr>
@@ -202,7 +203,7 @@
 
 [% END %]
   
-  <a href="query.cgi?[% buffer %]&format=report-table">Edit this report</a>
+  <a href="query.cgi?[% query FILTER html %]&amp;format=report-table">Edit this report</a>
 </div>
 
 <br>
-- 
cgit v1.2.3-24-g4f1b