include elements/search.html the right way to avoid problems with XLS download, ...

[freeside.git] / httemplate / search / sql.html

diff --git a/httemplate/search/sql.html b/httemplate/search/sql.html
index df9b8cd..71aa006 100644 (file)
--- a/httemplate/search/sql.html
+++ b/httemplate/search/sql.html
@@ -1,13 +1,15 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
                'title' => 'Query Results',
                'name'  => 'rows',
-               'query' => 'SELECT '. ( $cgi->param('sql')
-                             || errorpage('Empty query') ),
-    )
-%>
+               'query' => "SELECT $sql",
+          
+&>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Raw SQL');
 
+my $sql = $cgi->param('sql') or errorpage('Empty query');
+$sql =~ s/;+\s*$//; #remove trailing ;
+
 </%init>