Bug 232491 - try harder to avoid parameterless searches (either saved or otherwise...

diff --git a/buglist.cgi b/buglist.cgi
index d1a3c665bada9729752f6fc5db485e15f1e4a706..0871a8c5460d9f3c15fe177f0241bc25cdb3aa8e 100755 (executable)
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -179,7 +179,11 @@ sub LookupNamedQuery {
     my $qname = SqlQuote($name);
     SendSQL("SELECT query FROM namedqueries WHERE userid = $userid AND name = $qname");
     my $result = FetchOneColumn();
-    $result || ThrowUserError("missing_query", {'queryname' => $name});
+    
+    defined($result) || ThrowUserError("missing_query", {'queryname' => $name});
+    $result
+       || ThrowUserError("buglist_parameters_required", {'queryname' => $name});
+
     return $result;
 }
 
@@ -331,8 +335,10 @@ elsif (($::FORM{'cmdtype'} eq "doit") && $::FORM{'remtype'}) {
         $name !~ /[<>&]/ || ThrowUserError("illegal_query_name");
         my $qname = SqlQuote($name);
 
+        $::FORM{'newquery'} || ThrowUserError("buglist_parameters_required", 
+                                              {'queryname' => $name});
         my $qbuffer = SqlQuote($::FORM{'newquery'});
-
+        
         my $tofooter = 1;
 
         $vars->{'message'} = "buglist_new_named_query";

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 3fa735cc37ea0dd8b6bacd08b4ae9b6af4438ba1..1577619ee3a146b9db786f6330b66c7757ae1641 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -118,9 +118,7 @@
 
   [% ELSIF error == "buglist_parameters_required" %]
     [% title = "Parameters Required" %]
-    [% url   = "query.cgi" %]
-    [% link  = "Please use the search form to specify some search criteria." %]
-    This script is not meant to be invoked without any search terms.
+    You may not search, or create saved searches, without any search terms.
 
   [% ELSIF error == "bugs_not_changed" %]
     [% title = BLOCK %][% terms.Bugs %] Not Changed[% END %]