Merge branch 'develop' of ssh://git.mysociety.org/data/git/public/alaveteli into develop

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/xapian_queries.rb b/lib/xapian_queries.rb
index 5c02ba788..dbb17f592 100644
--- a/lib/xapian_queries.rb
+++ b/lib/xapian_queries.rb
@@ -77,10 +77,10 @@ module XapianQueries
     end
 
     def make_query_from_params(params)
-        query = params[:query] || "" if query.nil?
+        query = params.fetch(:query) { '' }
         query += get_date_range_from_params(params)
         query += get_request_variety_from_params(params)
         query += get_status_from_params(params)
-        return query
+        query
     end
 end