aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-02-14 20:46:10 +0000
committerLouise Crow <louise.crow@gmail.com>2013-02-14 20:46:10 +0000
commit7d037e56eea7c67acac5a8afca2ba9a33cb6d2c2 (patch)
tree35ca8c465fa2560d5807501e219ca513581e762f /app/controllers/general_controller.rb
parent3fab39a758d1320747f8f04a5fef2e0370eac17b (diff)
parent87beeb16db6e76bb28cc13e5382a81a8103c5cc8 (diff)
Merge remote-tracking branch 'openaustralia_github/fix-issue-789' into develop
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 875e39494..a8bbc22ff 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -151,10 +151,10 @@ class GeneralController < ApplicationController
params[:query] = @query
end
if @variety_postfix != "all" && @requests
- @query, _ = make_query_from_params
+ @query, _ = make_query_from_params(params)
end
@inputted_sortby = @sortby
- @common_query = get_tags_from_params
+ @common_query = get_tags_from_params(params)
if @sortby.nil?
# Parse query, so can work out if it has prefix terms only - if so then it is a
# structured query which should show newest first, rather than a free text search