Permalink
Browse files

Merge branch 'master' of github.com:criticaljuncture/fr2

  • Loading branch information...
2 parents 88344f9 + cbc67a2 commit 27ca89d9cc75913a6e7303a7af3a1f0a8478e0c9 @peregrinator peregrinator committed Sep 12, 2012
Showing with 1 addition and 8 deletions.
  1. +1 −8 app/searches/application_search.rb
@@ -184,16 +184,9 @@ def results(args = {})
}.merge(find_options).recursive_merge(args)
)
- sphinx_search = model.search(sphinx_term,
- :with => with,
- :with_all => with_all,
- :conditions => sphinx_conditions,
- :match_mode => :extended
- )
-
if result_array
result_array.each do |result|
- result.excerpts = ApplicationSearch::FileExcerpter.new sphinx_search, result
+ result.excerpts = ApplicationSearch::FileExcerpter.new result_array, result
end
end

0 comments on commit 27ca89d

Please sign in to comment.