aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-15 16:46:17 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-15 16:46:17 +0000
commitd8805988a125720a315580050b7195537fb6e77a (patch)
tree09a8f84ca844f020dcfa2ebe0db31e35d092e710 /activesupport
parent38e695037cb736196af05e0f4587742915ceee89 (diff)
downloadrails-d8805988a125720a315580050b7195537fb6e77a.tar.gz
rails-d8805988a125720a315580050b7195537fb6e77a.tar.bz2
rails-d8805988a125720a315580050b7195537fb6e77a.zip
Missing something from #475
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@413 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/dependencies.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/dependencies.rb b/activesupport/lib/dependencies.rb
index dc6c852c12..93c40fed1c 100644
--- a/activesupport/lib/dependencies.rb
+++ b/activesupport/lib/dependencies.rb
@@ -32,6 +32,7 @@ module Dependencies
old_loaded.each do |file_name|
begin
silence_warnings { load("#{file_name}.rb") } unless loaded.include?(file_name)
+ loaded << file_name
rescue LoadError
# The association didn't reside in its own file, so we assume it was required by other means
end