aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-02-27 22:26:50 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-02-27 22:26:50 +0000
commit0d70f31057ff5cbdd7f62708a62ce846a1811f9c (patch)
treec1d9a3e9f018c59da6349795c4d5c103c1cee624 /activerecord/lib/active_record
parentc6a3a39feade3ad5340cd3edfecbd024eecf653a (diff)
downloadrails-0d70f31057ff5cbdd7f62708a62ce846a1811f9c.tar.gz
rails-0d70f31057ff5cbdd7f62708a62ce846a1811f9c.tar.bz2
rails-0d70f31057ff5cbdd7f62708a62ce846a1811f9c.zip
Remove dead code from hmt#delete. Closes #11236 [rubyruy]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8932 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/associations/has_many_through_association.rb2
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 281db8fe06..19112216aa 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -83,7 +83,7 @@ module ActiveRecord
raise_on_type_mismatch(associate)
raise ActiveRecord::HasManyThroughCantDissociateNewRecords.new(@owner, through) unless associate.respond_to?(:new_record?) && !associate.new_record?
- @owner.send(through.name).proxy_target.delete(klass.delete_all(construct_join_attributes(associate)))
+ klass.delete_all(construct_join_attributes(associate))
@target.delete(associate)
end
end