diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-28 15:51:00 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-28 15:51:00 -0700 |
| commit | 16f5d297558671eb840a4e10aad6c769aa604c20 (patch) | |
| tree | beafa742801dfe329c8c8622ddedee7384fbf9c4 /activerecord | |
| parent | 10041e2d4542f347e9ce85dc44ba41ea3ab09644 (diff) | |
| download | rails-16f5d297558671eb840a4e10aad6c769aa604c20.tar.gz rails-16f5d297558671eb840a4e10aad6c769aa604c20.tar.bz2 rails-16f5d297558671eb840a4e10aad6c769aa604c20.zip | |
Revert "porting 066518295032a8e3f3468737337b8c8299442867 to master. Thanks Marcelo Giorgi"
This reverts commit 9eca11a4a564f44675cca951216e917b8f610eab.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index 456cd75ab1..e6b367790b 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -279,7 +279,7 @@ module ActiveRecord end else options = {} - options[:include] = reflection.options[:include] || reflection.options[:source] if reflection.options[:conditions] || reflection.options[:order] + options[:include] = reflection.options[:include] || reflection.options[:source] if reflection.options[:conditions] options[:order] = reflection.options[:order] options[:conditions] = reflection.options[:conditions] records.first.class.preload_associations(records, through_association, options) |