diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-03-04 09:53:26 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-03-04 09:53:26 +0000 |
| commit | 3912c73583464e3ff203e3e101325ccabcba0506 (patch) | |
| tree | 3b57620358c4c4cfe1c52702f2979876f6452aa0 /app/controllers/general_controller.rb | |
| parent | 2a49615ee3ea08f7952283efc0306a1ac0c23334 (diff) | |
| parent | af83354da1030c2d2fad3c63f3ccb516c4923d38 (diff) | |
Merge branch 'release/0.17' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 2 |
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? |