From 90d86a9744883ccc120a0a955ffade72990e1505 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Thu, 14 Apr 2016 21:03:00 +0200
Subject: Bug 1088022 - Bump min version to CGI 4.09 r=dkl

---
 Bugzilla/Search/Quicksearch.pm | 2 +-
 Bugzilla/Search/Saved.pm       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Bugzilla/Search')

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 8e188161c..249748062 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -248,7 +248,7 @@ sub quicksearch {
         }
 
         # Make sure we have some query terms left
-        scalar($cgi->param())>0 || ThrowUserError("buglist_parameters_required");
+        scalar $cgi->multi_param() or ThrowUserError("buglist_parameters_required");
     }
 
     # List of quicksearch-specific CGI parameters to get rid of.
diff --git a/Bugzilla/Search/Saved.pm b/Bugzilla/Search/Saved.pm
index 9f6addffe..27a2e38ca 100644
--- a/Bugzilla/Search/Saved.pm
+++ b/Bugzilla/Search/Saved.pm
@@ -220,10 +220,10 @@ sub edit_link {
     my ($self) = @_;
     return $self->{edit_link} if defined $self->{edit_link};
     my $cgi = new Bugzilla::CGI($self->url);
-    if (!$cgi->param('query_type') 
-        || !IsValidQueryType($cgi->param('query_type')))
+    if (!$cgi->param('query_format')
+        || !IsValidQueryType(scalar $cgi->param('query_format')))
     {
-        $cgi->param('query_type', 'advanced');
+        $cgi->param('query_format', 'advanced');
     }
     $self->{edit_link} = $cgi->canonicalise_query;
     return $self->{edit_link};
-- 
cgit v1.2.3-24-g4f1b