diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-01-03 12:04:33 +0000 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-03 16:24:32 -0800 |
commit | 99a8d8430f9b819cd3e8cb3aab44cb04ea402532 (patch) | |
tree | 0879c76ed6700a985ac68108cc6929622981e5f2 /activerecord/lib/active_record/associations/association_collection.rb | |
parent | 1313d386dacb580858e5951418a637f4e17cf5c1 (diff) | |
download | rails-99a8d8430f9b819cd3e8cb3aab44cb04ea402532.tar.gz rails-99a8d8430f9b819cd3e8cb3aab44cb04ea402532.tar.bz2 rails-99a8d8430f9b819cd3e8cb3aab44cb04ea402532.zip |
Create the association scope directly rather than going through with_scope
Diffstat (limited to 'activerecord/lib/active_record/associations/association_collection.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 6defc465d8..4bd8a8e2d2 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -333,7 +333,7 @@ module ActiveRecord protected - def construct_find_scope + def finder_options { :conditions => construct_conditions, :select => construct_select, |