aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2011-06-03 13:52:46 +0100
committerAndrew White <andyw@pixeltrix.co.uk>2011-06-03 13:57:00 +0100
commit54883682dea9a6766b066cd290cbe151f002a240 (patch)
treebfde3ccd5b569e1e2a970b29e5453880b7f217ac /activerecord
parentf064664de72a34d24568eadf7340f41876df4b20 (diff)
downloadrails-54883682dea9a6766b066cd290cbe151f002a240.tar.gz
rails-54883682dea9a6766b066cd290cbe151f002a240.tar.bz2
rails-54883682dea9a6766b066cd290cbe151f002a240.zip
Don't double assign attributes - closes #1467.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/collection_association.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 02cc455a4e..7e1a41e84d 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -436,7 +436,6 @@ module ActiveRecord
def build_record(attributes, options)
record = reflection.build_association(attributes, options)
record.assign_attributes(create_scope.except(*record.changed), :without_protection => true)
- record.assign_attributes(attributes, options)
record
end