diff options
| -rw-r--r-- | Bugzilla/Config/Query.pm | 7 | ||||
| -rw-r--r-- | Bugzilla/Search/Quicksearch.pm | 13 | ||||
| -rw-r--r-- | template/en/default/admin/params/query.html.tmpl | 4 |
3 files changed, 3 insertions, 21 deletions
diff --git a/Bugzilla/Config/Query.pm b/Bugzilla/Config/Query.pm index fbfdb4c22..6479db8ce 100644 --- a/Bugzilla/Config/Query.pm +++ b/Bugzilla/Config/Query.pm @@ -68,13 +68,6 @@ sub get_param_list { }, { - name => 'quicksearch_comment_cutoff', - type => 't', - default => '4', - checker => \&check_numeric - }, - - { name => 'specific_search_allow_empty_words', type => 'b', default => 1 diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm index 70b5e2f2c..5f5eae95f 100644 --- a/Bugzilla/Search/Quicksearch.pm +++ b/Bugzilla/Search/Quicksearch.pm @@ -167,8 +167,6 @@ sub quicksearch { $searchstring =~ s/\s+NOT\s+/ -/g; my @words = splitString($searchstring); - my $searchComments = - $#words < Bugzilla->params->{'quicksearch_comment_cutoff'}; my @openStates = BUG_STATE_OPEN; my @closedStates; my @unknownFields; @@ -245,10 +243,8 @@ sub quicksearch { } } elsif ($firstChar eq '#') { - addChart('short_desc', 'anywords', $baseWord, $negate); - if ($searchComments) { - addChart('longdesc', 'anywords', $baseWord, $negate); - } + addChart('short_desc', 'substring', $baseWord, $negate); + addChart('content', 'matches', $baseWord, $negate); } elsif ($firstChar eq ':') { foreach (@subWords) { @@ -386,10 +382,7 @@ sub quicksearch { addChart('status_whiteboard', 'substring', $word, $negate); } - if ($searchComments) { - addChart('longdesc', 'substring', - $word, $negate); - } + addChart('content', 'matches', $word, $negate); } # URL field (for IP addrs, host.names, # scheme://urls) diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl index 8d6aba422..ffee4e1a8 100644 --- a/template/en/default/admin/params/query.html.tmpl +++ b/template/en/default/admin/params/query.html.tmpl @@ -51,10 +51,6 @@ "access the advanced query page. It's in URL parameter " _ "format, which makes it hard to read. Sorry!", - quicksearch_comment_cutoff => "The maximum number of search terms for a QuickSearch " _ - "to search comments. If the QuickSearch query contains " _ - "more terms than this value, QuickSearch will not search comments.", - specific_search_allow_empty_words => "Whether to allow a search on the 'Find a Specific " _ "Bug' page with an empty 'Words' field." } %] |