diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:51:18 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:51:18 +0100 |
| commit | 3d12cbe6ee7ff49dad9a473efc0792b2a4f4cba6 (patch) | |
| tree | 1c43d3a004293f442f61b0e64847a4ef16cacd2a /app/controllers/general_controller.rb | |
| parent | c449240a1b1cddebb53e9748b15be43c0f65c463 (diff) | |
| parent | 4b95ccffc468c256d6ba6248303dd2b78bf5896a (diff) | |
Merge branch 'release/0.13' into wdtk
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 939dd1739..540f67ec9 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -147,7 +147,6 @@ class GeneralController < ApplicationController @query, _ = make_query_from_params(params) end @inputted_sortby = @sortby - @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 |