diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
commit | b394b67663916c865452cc784d8642f72a305be5 (patch) | |
tree | 63c92172fe7813e6354da0ead628ed2192ef0ee2 /app/controllers/general_controller.rb | |
parent | 8d21293461ce4b564261686ab8d6460f5fe51259 (diff) | |
parent | f83b917ec2c59da0ce7c27da19b740366da58419 (diff) |
Merge branch 'release/0.8' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/contact_mailer/from_admin_message.rhtml
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r-- | app/controllers/general_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 875e39494..f6a46458e 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 @@ -229,7 +229,5 @@ class GeneralController < ApplicationController @locale = self.locale_from_params() render(:layout => false, :content_type => 'text/css') end - - end |