diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-14 07:49:13 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-14 07:49:13 +0000 |
commit | 75b8ac80d988c39e48966d6b60f0d1d46c0d75a6 (patch) | |
tree | a30b3f7ad12046afe56ca2c89c86a89eec497589 /activerecord/lib/active_record | |
parent | cef09015c7264adf082bff01a220a0b66a83dd90 (diff) | |
download | rails-75b8ac80d988c39e48966d6b60f0d1d46c0d75a6.tar.gz rails-75b8ac80d988c39e48966d6b60f0d1d46c0d75a6.tar.bz2 rails-75b8ac80d988c39e48966d6b60f0d1d46c0d75a6.zip |
Dont initialize the association proxy for nil records
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1165 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rwxr-xr-x | activerecord/lib/active_record/associations.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 1b78b02e84..b1daf3df1e 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -557,6 +557,7 @@ module ActiveRecord end define_method("set_#{association_name}_target") do |target| + return if target.nil? association = association_proxy_class.new(self, association_name, association_class_name, association_class_primary_key_name, options) |