diff options
| author | José Valim <jose.valim@gmail.com> | 2010-11-28 16:55:48 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-11-28 16:55:53 +0100 |
| commit | e444439fe28f873c783a4b99b1c9f29a7405dd0d (patch) | |
| tree | 75ac578b9a756cabf8af1d08e969d3623f440610 /activerecord/lib/active_record/associations/association_proxy.rb | |
| parent | 31906eecdf7bffc2203379c5d40f1bb77fb35858 (diff) | |
| download | rails-e444439fe28f873c783a4b99b1c9f29a7405dd0d.tar.gz rails-e444439fe28f873c783a4b99b1c9f29a7405dd0d.tar.bz2 rails-e444439fe28f873c783a4b99b1c9f29a7405dd0d.zip | |
Partialy revert f1c13b0dd7b22b5f6289ca1a09f1d7a8c7c8584b
Diffstat (limited to 'activerecord/lib/active_record/associations/association_proxy.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_proxy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index 7cd04a1ad5..252ff7e7ea 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -252,7 +252,7 @@ module ActiveRecord def load_target return nil unless defined?(@loaded) - if !loaded? and (@owner.persisted? || foreign_key_present) + if !loaded? && (!@owner.new_record? || foreign_key_present) @target = find_target end |