diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-01-26 23:00:13 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-01-30 11:58:09 +0000 |
| commit | 3fa61ccb9eed0f17cdef85470ae708b4b09a3c06 (patch) | |
| tree | 7f750e467a122891d248cbc0badb9ce485a37a51 /activerecord/lib/active_record | |
| parent | c5e912a8b38bc3555385e43a052a8d3eb0541ff3 (diff) | |
| download | rails-3fa61ccb9eed0f17cdef85470ae708b4b09a3c06.tar.gz rails-3fa61ccb9eed0f17cdef85470ae708b4b09a3c06.tar.bz2 rails-3fa61ccb9eed0f17cdef85470ae708b4b09a3c06.zip | |
Has many through - It is not necessary to manually merge in the conditions hash for the through record, because the creation is done directly on the through association, which will already handle setting the conditions.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/through_association.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb index ac62f854e8..be1fc79846 100644 --- a/activerecord/lib/active_record/associations/through_association.rb +++ b/activerecord/lib/active_record/associations/through_association.rb @@ -88,10 +88,6 @@ module ActiveRecord join_attributes.merge!(@reflection.source_reflection.foreign_type => associate.class.base_class.name) end - if @reflection.through_reflection.options[:conditions].is_a?(Hash) - join_attributes.merge!(@reflection.through_reflection.options[:conditions]) - end - join_attributes end |