diff options
Diffstat (limited to 'vendor/plugins/acts_as_searchable/lib')
-rw-r--r-- | vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb index ed19dc736..1af226ae4 100644 --- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb +++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb @@ -119,13 +119,11 @@ module Redmine results = [] results_count = 0 - - with_scope(:find => {:conditions => project_conditions}) do - with_scope(:find => find_options) do - results_count = scope.count(:all) - results = scope.find(:all, limit_options) - end - end + + scope = scope.scoped({:conditions => project_conditions}).scoped(find_options) + results_count = scope.count(:all) + results = scope.find(:all, limit_options) + [results, results_count] end end |