aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/association_collection.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2010-12-26 21:37:25 +0000
committerAaron Patterson <aaron.patterson@gmail.com>2010-12-26 16:27:12 -0700
commit9f5c18ce075179cfc73a00cba9a19d69aaf5274c (patch)
treeb463005edeabe4a98337b557953672d07864a855 /activerecord/lib/active_record/associations/association_collection.rb
parent57420dffb6663e31c12729ab3348cf824bfcff6a (diff)
downloadrails-9f5c18ce075179cfc73a00cba9a19d69aaf5274c.tar.gz
rails-9f5c18ce075179cfc73a00cba9a19d69aaf5274c.tar.bz2
rails-9f5c18ce075179cfc73a00cba9a19d69aaf5274c.zip
Refactor we_can_set_the_inverse_on_this? to use a less bizarre name amongst other things
Diffstat (limited to 'activerecord/lib/active_record/associations/association_collection.rb')
-rw-r--r--activerecord/lib/active_record/associations/association_collection.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index 86cc17394c..97d9288874 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -454,9 +454,7 @@ module ActiveRecord
end
records = @reflection.options[:uniq] ? uniq(records) : records
- records.each do |record|
- set_inverse_instance(record, @owner)
- end
+ records.each { |record| set_inverse_instance(record) }
records
end
@@ -470,7 +468,7 @@ module ActiveRecord
@target << record
end
callback(:after_add, record)
- set_inverse_instance(record, @owner)
+ set_inverse_instance(record)
record
end