From 16f5d297558671eb840a4e10aad6c769aa604c20 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 28 Sep 2010 15:51:00 -0700 Subject: Revert "porting 066518295032a8e3f3468737337b8c8299442867 to master. Thanks Marcelo Giorgi" This reverts commit 9eca11a4a564f44675cca951216e917b8f610eab. --- activerecord/lib/active_record/association_preload.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') 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) -- cgit v1.2.3