diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-03 10:27:58 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-03 10:27:58 -0700 |
commit | befeeb2d0aef8db4ba84d1e2fa0d273f8a111363 (patch) | |
tree | 70e00f8546f6bb7765474dd792c1d08ed7ecac19 /activerecord/lib/active_record | |
parent | 5aee516b5edb49d7206cd9815c13a78b6b16c5d9 (diff) | |
parent | 83c4b0a7f977b75a9005ceb78d8a2a719392d904 (diff) | |
download | rails-befeeb2d0aef8db4ba84d1e2fa0d273f8a111363.tar.gz rails-befeeb2d0aef8db4ba84d1e2fa0d273f8a111363.tar.bz2 rails-befeeb2d0aef8db4ba84d1e2fa0d273f8a111363.zip |
Merge branch '3-2-stable' into 3-2-sec
* 3-2-stable:
make sure both headers are set before checking for ip spoofing
Move set_inverse_instance to association.build_record
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/associations/association.rb | 1 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index 99f307922e..1e324c7e95 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -240,6 +240,7 @@ module ActiveRecord skip_assign = [reflection.foreign_key, reflection.type].compact attributes = create_scope.except(*(record.changed - skip_assign)) record.assign_attributes(attributes, :without_protection => true) + set_inverse_instance(record) end end end diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index baddb9852f..c2dd462b5d 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -350,7 +350,6 @@ module ActiveRecord end callback(:after_add, record) - set_inverse_instance(record) record end |