aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-17 00:44:22 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-17 00:44:22 +0000
commit44ac6046c1e7b88e993293fa68ec015d52a7b26c (patch)
tree14e8e87a7c3358f8f49d052227503e4a7610f188 /activerecord/lib/active_record/associations
parent8b82c5042dbd8bb8b15b0ca4ac915ee5e1547879 (diff)
downloadrails-44ac6046c1e7b88e993293fa68ec015d52a7b26c.tar.gz
rails-44ac6046c1e7b88e993293fa68ec015d52a7b26c.tar.bz2
rails-44ac6046c1e7b88e993293fa68ec015d52a7b26c.zip
Only remember that an association was loaded if it was found
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@435 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/association_proxy.rb2
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 424d7f818a..e1dcffe537 100644
--- a/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/activerecord/lib/active_record/associations/association_proxy.rb
@@ -58,7 +58,7 @@ module ActiveRecord
reset
end
end
- @loaded = true
+ @loaded = true if @target
@target
end