aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_one_association.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-03 06:25:39 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-03 06:25:39 +0000
commit116658e69b9c4a722e6ae8717629b8cd0057db89 (patch)
tree998f82f091355374ba02f79071e6b5990ac8b713 /activerecord/lib/active_record/associations/has_one_association.rb
parent9ed7430b9489dc1e8e695a065fe34e319e3ba2b4 (diff)
downloadrails-116658e69b9c4a722e6ae8717629b8cd0057db89.tar.gz
rails-116658e69b9c4a722e6ae8717629b8cd0057db89.tar.bz2
rails-116658e69b9c4a722e6ae8717629b8cd0057db89.zip
Fixed that calling HasOneProxy#build_model repeatedly would cause saving to happen (closes #4058) [anna@wota.jp]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3753 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_one_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index d07323a869..65f584c6f9 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -34,7 +34,7 @@ module ActiveRecord
@owner.clear_association_cache
else
@target[@reflection.primary_key_name] = nil
- @target.save unless @owner.new_record?
+ @target.save unless @owner.new_record? || @target.new_record?
end
end