From 8532de99d9b6d1a1ec53e9fb2f6ef7374fab4674 Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Tue, 31 May 2011 09:24:17 -0700 Subject: Bug 647649: Change the old "Boolean Charts" UI into the new AND/OR "Custom Search" UI. r=timello, a=mkanat --- Bugzilla/CGI.pm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'Bugzilla/CGI.pm') diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm index 627b78b58..e0e1c40ba 100644 --- a/Bugzilla/CGI.pm +++ b/Bugzilla/CGI.pm @@ -149,9 +149,18 @@ sub clean_search_url { $self->delete("${param}_type"); } - # Boolean Chart stuff is empty if it's "noop" - if ($param =~ /\d-\d-\d/ && defined $self->param($param) - && $self->param($param) eq 'noop') + # Custom Search stuff is empty if it's "noop". We also keep around + # the old Boolean Chart syntax for backwards-compatibility. + if (($param =~ /\d-\d-\d/ || $param =~ /^[[:alpha:]]\d+$/) + && defined $self->param($param) && $self->param($param) eq 'noop') + { + $self->delete($param); + } + + # Any "join" for custom search that's an AND can be removed, because + # that's the default. + if (($param =~ /^j\d+$/ || $param eq 'j_top') + && $self->param($param) eq 'AND') { $self->delete($param); } -- cgit v1.2.3-24-g4f1b