1 files changed, 3 insertions, 5 deletions
diff --git a/httemplate/search/sql.html b/httemplate/search/sql.html
index bf5446975..df9b8cddb 100644
--- a/httemplate/search/sql.html
+++ b/httemplate/search/sql.html
@@ -1,15 +1,13 @@
 <% include( 'elements/search.html',
                'title' => 'Query Results',
                'name'  => 'rows',
-               'query' => "SELECT $sql",
-          )
+               'query' => 'SELECT '. ( $cgi->param('sql')
+                             || errorpage('Empty query') ),
+    )
 %>
 <%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>