diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-08-20 15:58:11 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-08-20 15:58:11 +0100 |
| commit | ce30500cea5c2d6304643bc90ce0c5b36a2f5919 (patch) | |
| tree | 92ef48879721d017e7b72e663ef8dbc3d6421fb0 /app/controllers/general_controller.rb | |
| parent | f757ce4ba02c6621e04a349376aeda1c1cb553a3 (diff) | |
| parent | dfb5f97ac44656f0e021b09856e0c54b9fa41b3f (diff) | |
Merge branch 'release/0.13'0.13
Conflicts:
locale/bg/app.po
locale/es/app.po
locale/fi/app.po
locale/fr/app.po
locale/fr_CA/app.po
locale/he_IL/app.po
locale/hr/app.po
locale/nb_NO/app.po
locale/nl/app.po
locale/pt_BR/app.po
locale/ro_RO/app.po
locale/sl/app.po
locale/vi/app.po
script/rails-post-deploy
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 |