aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-01-28 16:33:02 +0000
committerLouise Crow <louise.crow@gmail.com>2014-01-28 16:33:02 +0000
commit89a8fd2ce9880ae0f194733991aa93e447f0ba73 (patch)
tree7fd691a4f7cbd3f1aff61dd91f056a16478d5291 /app/controllers/general_controller.rb
parent90fd29903b9db724c941b6e6efa39f41313e8825 (diff)
parentdf0583a94c6a3ce7ded818cb46688b7edc928302 (diff)
Merge branch 'feature/cache-request-lists' into rails-3-develop
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index b01a67027..6f0d29889 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -103,7 +103,7 @@ class GeneralController < ApplicationController
params[:query] = @query
end
if @variety_postfix != "all" && @requests
- @query, _ = make_query_from_params(params)
+ @query = InfoRequestEvent.make_query_from_params(params)
end
@inputted_sortby = @sortby
if @sortby.nil?