diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-28 10:04:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-28 10:04:33 -0700 |
| commit | 9eca11a4a564f44675cca951216e917b8f610eab (patch) | |
| tree | fdb54f6164822a0a24e724a452ae30653b930f4e /activerecord/lib/active_record | |
| parent | bee447a5b9fe1d683c6cc69aefb7fc22c2a9d9af (diff) | |
| download | rails-9eca11a4a564f44675cca951216e917b8f610eab.tar.gz rails-9eca11a4a564f44675cca951216e917b8f610eab.tar.bz2 rails-9eca11a4a564f44675cca951216e917b8f610eab.zip | |
porting 066518295032a8e3f3468737337b8c8299442867 to master. Thanks Marcelo Giorgi
Diffstat (limited to 'activerecord/lib/active_record')
| -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 e6b367790b..456cd75ab1 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] + options[:include] = reflection.options[:include] || reflection.options[:source] if reflection.options[:conditions] || reflection.options[:order] options[:order] = reflection.options[:order] options[:conditions] = reflection.options[:conditions] records.first.class.preload_associations(records, through_association, options) |