diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-02 19:35:58 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-02 19:35:58 +0000 |
| commit | 1f6c4aca28c5514e5d1b96b6372398aba76a3776 (patch) | |
| tree | 5c08acf4c9ee2e88a4d954a55704e7f47937f06e /activesupport/lib | |
| parent | dc792361202bd7a682da79375ce1236a7b3ec293 (diff) | |
| download | rails-1f6c4aca28c5514e5d1b96b6372398aba76a3776.tar.gz rails-1f6c4aca28c5514e5d1b96b6372398aba76a3776.tar.bz2 rails-1f6c4aca28c5514e5d1b96b6372398aba76a3776.zip | |
Fixed loading problems with controller hierarchies
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@320 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/dependencies.rb | 5 |
1 files changed, 4 insertions, 1 deletions
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 |