From f8f988fbc1ca1d183dbeb8e1e942706552507e84 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Tue, 3 Jul 2007 21:22:00 +0000 Subject: Bug 385910: Rename the 'quicksearch_allow_empty_words' parameter to 'specific_search_allow_empty_words' (to avoid confusion with the QuickSearch feature) - Patch by Brad Johnson r=wicked a=mkanat --- Bugzilla/Config/Query.pm | 2 +- buglist.cgi | 6 +++--- template/en/default/admin/params/query.html.tmpl | 3 ++- template/en/default/search/search-specific.html.tmpl | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Bugzilla/Config/Query.pm b/Bugzilla/Config/Query.pm index afd330898..74e265037 100644 --- a/Bugzilla/Config/Query.pm +++ b/Bugzilla/Config/Query.pm @@ -75,7 +75,7 @@ sub get_param_list { }, { - name => 'quicksearch_allow_empty_words', + name => 'specific_search_allow_empty_words', type => 'b', default => 0 } diff --git a/buglist.cgi b/buglist.cgi index 0f5c55691..aa19a4b4b 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -75,9 +75,9 @@ if (defined($searchstring)) { } # If configured to not allow empty words, reject empty searches from the -# simple search form, including words being a single or several consecutive -# whitespaces only. -if (!Bugzilla->params->{'quicksearch_allow_empty_words'} +# Find a Specific Bug search form, including words being a single or +# several consecutive whitespaces only. +if (!Bugzilla->params->{'specific_search_allow_empty_words'} && defined($cgi->param('content')) && $cgi->param('content') =~ /^\s*$/) { ThrowUserError("buglist_parameters_required"); diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl index b3f0b0f66..cdc48473e 100644 --- a/template/en/default/admin/params/query.html.tmpl +++ b/template/en/default/admin/params/query.html.tmpl @@ -56,5 +56,6 @@ "to search comments. If the QuickSearch query contains " _ "more terms than this value, QuickSearch will not search comments.", - quicksearch_allow_empty_words => "Whether to allow a QuickSearch with empty Words." } + specific_search_allow_empty_words => "Whether to allow a search on the 'Find a Specific " _ + "Bug' page with an empty 'Words' field." } %] diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl index af633ddf7..5e3c93829 100644 --- a/template/en/default/search/search-specific.html.tmpl +++ b/template/en/default/search/search-specific.html.tmpl @@ -110,7 +110,7 @@ for "crash secure SSL flash". - [% IF Param('quicksearch_allow_empty_words') %] + [% IF Param('specific_search_allow_empty_words') %] [% ELSE %]