diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-10 23:52:37 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-10 23:52:37 +0000 |
| commit | 445f89ccb57040e42355e2078d13f4b70a95ee7c (patch) | |
| tree | 0012b95b53763437f2367eccc0f1acc3a5c42e86 | |
| parent | 3ff5c5805fb490591b5839db8445869a48e93bcb (diff) | |
| download | rails-445f89ccb57040e42355e2078d13f4b70a95ee7c.tar.gz rails-445f89ccb57040e42355e2078d13f4b70a95ee7c.tar.bz2 rails-445f89ccb57040e42355e2078d13f4b70a95ee7c.zip | |
Fixed that Dependencies.reload can't load the same file twice #420 [Kent Sibilev]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@377 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/dependencies.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 6ac105bde1..f379aae5b9 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,3 +1,5 @@ +* Fixed that Dependencies.reload can't load the same file twice #420 [Kent Sibilev] + * Added Fixnum#ago/until, Fixnum#since/from_now #450 [bitsweat] * Added that Inflector now accepts Symbols and Classes by calling .to_s on the word supplied diff --git a/activesupport/lib/dependencies.rb b/activesupport/lib/dependencies.rb index 1035bf714d..dc6c852c12 100644 --- a/activesupport/lib/dependencies.rb +++ b/activesupport/lib/dependencies.rb @@ -31,7 +31,7 @@ module Dependencies old_loaded.each do |file_name| begin - silence_warnings { load("#{file_name}.rb") } + silence_warnings { load("#{file_name}.rb") } unless loaded.include?(file_name) rescue LoadError # The association didn't reside in its own file, so we assume it was required by other means end |