aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/association_proxy.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-18 02:11:43 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-18 02:11:43 +0000
commite48b062eed430eea43ca94630310e9a7d663cf03 (patch)
tree75070ecf9f9c8b7bdc6372ca1cd386fb8c228023 /activerecord/lib/active_record/associations/association_proxy.rb
parenta56081d99ab056859679a92fb8f4a95e02bb6b5c (diff)
downloadrails-e48b062eed430eea43ca94630310e9a7d663cf03.tar.gz
rails-e48b062eed430eea43ca94630310e9a7d663cf03.tar.bz2
rails-e48b062eed430eea43ca94630310e9a7d663cf03.zip
Sanitize Base#inspect. Closes #8392.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6761 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/association_proxy.rb')
-rw-r--r--activerecord/lib/active_record/associations/association_proxy.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb
index 010e4e396b..96cbd3043a 100644
--- a/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/activerecord/lib/active_record/associations/association_proxy.rb
@@ -73,7 +73,8 @@ module ActiveRecord
end
def inspect
- loaded? ? @target.inspect : "<#{@reflection.name} not loaded yet>"
+ reload unless loaded?
+ @target.inspect
end
protected