Commit e58ccfd7 authored by olav%bkor.dhs.org's avatar olav%bkor.dhs.org

Bug 355924: report.cgi generates bare '&' in img src URL

Patch by Olav Vitters <olav@bkor.dhs.org> r=LpSolit a=justdave
parent 25b33895
...@@ -137,7 +137,6 @@ ...@@ -137,7 +137,6 @@
], ],
'reports/report.html.tmpl' => [ 'reports/report.html.tmpl' => [
'imagebase',
'width', 'width',
'height', 'height',
'imageurl', 'imageurl',
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
# format: string. Format of the individual reports. # format: string. Format of the individual reports.
# width: integer. For image charts, height of the image. # width: integer. For image charts, height of the image.
# height: integer. For image charts, width 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. # switchbase: string. Base URL for format switching.
# cumulate: boolean. For bar/line charts, whether to cumulate data sets. # cumulate: boolean. For bar/line charts, whether to cumulate data sets.
#%] #%]
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
<h2>[% tbl_disp FILTER html %]</h2> <h2>[% tbl_disp FILTER html %]</h2>
[% END %] [% 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; [% format FILTER url_quote %]&amp;ctype=png&amp;action=plot&amp;
[% IF tbl_field %] [% IF tbl_field %]
[% IF tbl != "-total-" %] [% IF tbl != "-total-" %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment