From 1f6c4aca28c5514e5d1b96b6372398aba76a3776 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 2 Jan 2005 19:35:58 +0000
Subject: Fixed loading problems with controller hierarchies

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@320 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activesupport/lib/dependencies.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/dependencies.rb b/activesupport/lib/dependencies.rb
index 7ddc6c318e..1035bf714d 100644
--- a/activesupport/lib/dependencies.rb
+++ b/activesupport/lib/dependencies.rb
@@ -26,7 +26,10 @@ module Dependencies
   end
 
   def reload
-    loaded.each do |file_name| 
+    old_loaded = loaded
+    clear
+    
+    old_loaded.each do |file_name| 
       begin
         silence_warnings { load("#{file_name}.rb") }
       rescue LoadError
-- 
cgit v1.2.3