summaryrefslogtreecommitdiffstats
path: root/app/controllers/search_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-07-09 11:25:01 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-07-09 11:25:01 +0000
commit389c7779e6ed985cfae60cd532daa82565fbe80d (patch)
tree834872538eedd5df013eae31f246627b5b77cadb /app/controllers/search_controller.rb
parent2072669769d24248789366e6552231c1cac5695d (diff)
downloadredmine-389c7779e6ed985cfae60cd532daa82565fbe80d.tar.gz
redmine-389c7779e6ed985cfae60cd532daa82565fbe80d.zip
Fixed: search options get lost after clicking on a specific result type (#7501).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6201 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/search_controller.rb')
-rw-r--r--app/controllers/search_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f2e146b2f..440497c6e 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -24,8 +24,8 @@ class SearchController < ApplicationController
def index
@question = params[:q] || ""
@question.strip!
- @all_words = params[:all_words] || (params[:submit] ? false : true)
- @titles_only = !params[:titles_only].nil?
+ @all_words = params[:all_words] ? params[:all_words].present? : true
+ @titles_only = params[:titles_only] ? params[:titles_only].present? : false
projects_to_search =
case params[:scope]