diff options
| author | railsbob <anup.narkhede@gmail.com> | 2009-08-09 13:01:42 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-09 17:02:19 +0100 |
| commit | 076ca48bd649ddea4dd1a320879c03a9fe7a0a6d (patch) | |
| tree | d26b44c85916f94c43849c430d13afcbaa1065e1 /activerecord/lib/active_record | |
| parent | 654568e71b1ee36a04acef74b1a8ce4737050882 (diff) | |
| download | rails-076ca48bd649ddea4dd1a320879c03a9fe7a0a6d.tar.gz rails-076ca48bd649ddea4dd1a320879c03a9fe7a0a6d.tar.bz2 rails-076ca48bd649ddea4dd1a320879c03a9fe7a0a6d.zip | |
Ensure hm:t#find does not assign nil to :include [#1845 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index ed7c3a6e08..f4507c979c 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -54,7 +54,7 @@ module ActiveRecord options[:select] = construct_select(options[:select]) options[:from] ||= construct_from options[:joins] = construct_joins(options[:joins]) - options[:include] = @reflection.source_reflection.options[:include] if options[:include].nil? + options[:include] = @reflection.source_reflection.options[:include] if options[:include].nil? && @reflection.source_reflection.options[:include] end def insert_record(record, force = true, validate = true) |