From b03d3fa623ce52da2969cf4f4aa4671378403e6e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Jul 2016 07:53:37 +0000
Subject: [PATCH] Merged r15583 and r15584 (#23153).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15618 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/search_controller.rb | 2 +-
 app/views/search/index.html.erb      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 2888a8889..cc1970ef1 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -68,7 +68,7 @@ class SearchController < ApplicationController
     fetcher = Redmine::Search::Fetcher.new(
       @question, User.current, @scope, projects_to_search,
       :all_words => @all_words, :titles_only => @titles_only, :attachments => @search_attachments, :open_issues => @open_issues,
-      :cache => params[:page].present?
+      :cache => params[:page].present?, :params => params
     )
 
     if fetcher.tokens.present?
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 6fceaeab2..53ec17a63 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -26,6 +26,7 @@
       <label><%= radio_button_tag 'attachments', '1', @search_attachments == '1' %> <%= l(:label_search_attachments_yes) %></label>
       <label><%= radio_button_tag 'attachments', 'only', @search_attachments == 'only' %> <%= l(:label_search_attachments_only) %></label>
     </p>
+    <%= call_hook(:view_search_index_options_content_bottom) %>
   </div>
 </fieldset>
 <%= hidden_field_tag 'options', '', :id => 'show-options' %>