diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb index 2592d22..af2896f 100644 --- a/app/controllers/public/search_controller.rb +++ b/app/controllers/public/search_controller.rb @@ -5,11 +5,16 @@ class SearchController < ApplicationController before_filter :load_category before_filter :prepare_filter before_filter :check_search_whole_site + before_filter :load_search_assets no_design_blocks protected + def load_search_assets + @search_in = SEARCH_IN + end + def search(finder, query) finder.find_by_contents(query).sort_by do |hit| -(relevance_for(hit)) @@ -106,7 +111,6 @@ class SearchController < ApplicationController ####################################################### def popup - @search_in = SEARCH_IN render :action => 'popup', :layout => false end diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml index 8a994e2..8bc0b71 100644 --- a/app/views/search/_display_results.rhtml +++ b/app/views/search/_display_results.rhtml @@ -1,9 +1,6 @@ -