From e58ccfd7946e2f0164bdabf0b9dd68f31bdae287 Mon Sep 17 00:00:00 2001
From: "olav%bkor.dhs.org" <>
Date: Mon, 23 Oct 2006 05:32:01 +0000
Subject: Bug 355924: report.cgi generates bare '&' in img src URL Patch by
 Olav Vitters <olav@bkor.dhs.org> r=LpSolit a=justdave

---
 template/en/default/filterexceptions.pl      | 1 -
 template/en/default/reports/report.html.tmpl | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index dbfb5249a..58988b68e 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -137,7 +137,6 @@
 ],
 
 'reports/report.html.tmpl' => [
-  'imagebase', 
   'width', 
   'height', 
   'imageurl', 
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 5e7d74dac..06acaf422 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -29,6 +29,7 @@
   # format: string. Format of the individual reports.
   # width: integer. For image charts, height of the image.
   # height: integer. For image charts, width of the image.
+  # imagebase: string. Base URL for chart image.
   # switchbase: string. Base URL for format switching.
   # cumulate: boolean. For bar/line charts, whether to cumulate data sets.
   #%]
@@ -97,7 +98,7 @@
         <h2>[% tbl_disp FILTER html %]</h2>
       [% END %]
       
-      [% imageurl = BLOCK %]report.cgi?[% imagebase %]&amp;format=
+      [% imageurl = BLOCK %]report.cgi?[% imagebase FILTER html %]&amp;format=
         [% format FILTER url_quote %]&amp;ctype=png&amp;action=plot&amp;
         [% IF tbl_field %]
           [% IF tbl != "-total-" %]
-- 
cgit v1.2.3-24-g4f1b