aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-05-10 23:21:17 +0100
committerJon Leighton <j@jonathanleighton.com>2011-05-10 23:35:15 +0100
commit93a85ce333db35b96a70ad02418db8866d89fc08 (patch)
treef8f61a25ab3895e22f0f02983845dbd7edde49fa
parenta87894ae57dcabbb299886959ec5646e356a7b56 (diff)
downloadrails-93a85ce333db35b96a70ad02418db8866d89fc08.tar.gz
rails-93a85ce333db35b96a70ad02418db8866d89fc08.tar.bz2
rails-93a85ce333db35b96a70ad02418db8866d89fc08.zip
Remove unnecessary '|| {}'
-rw-r--r--activerecord/lib/active_record/associations/collection_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 59e6e00ad1..ccd6b82217 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -424,7 +424,7 @@ module ActiveRecord
def build_record(attributes, options)
record = reflection.build_association
record.assign_attributes(scoped.scope_for_create, :without_protection => true)
- record.assign_attributes(attributes || {}, options)
+ record.assign_attributes(attributes, options)
record
end