diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-16 13:07:28 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-16 13:07:28 +0000 |
| commit | 394cf21ce73cae503f4c5272ef2a417df6fd21a5 (patch) | |
| tree | 0e093139077676ba2744119d7e24f1cffb8f142a /activesupport | |
| parent | 9a33b9a73745401c1c715ee65f7e30f029d3e6a7 (diff) | |
| download | rails-394cf21ce73cae503f4c5272ef2a417df6fd21a5.tar.gz rails-394cf21ce73cae503f4c5272ef2a417df6fd21a5.tar.bz2 rails-394cf21ce73cae503f4c5272ef2a417df6fd21a5.zip | |
Minor tweaks
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@428 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/core_ext/string/inflections.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/dependencies.rb | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/lib/core_ext/string/inflections.rb b/activesupport/lib/core_ext/string/inflections.rb index 90fd013861..fc2de08f0c 100644 --- a/activesupport/lib/core_ext/string/inflections.rb +++ b/activesupport/lib/core_ext/string/inflections.rb @@ -1,3 +1,4 @@ +require File.dirname(__FILE__) + '/../../inflector' module ActiveSupport module CoreExtensions module String diff --git a/activesupport/lib/dependencies.rb b/activesupport/lib/dependencies.rb index 93c40fed1c..1452b63a77 100644 --- a/activesupport/lib/dependencies.rb +++ b/activesupport/lib/dependencies.rb @@ -30,8 +30,10 @@ module Dependencies clear old_loaded.each do |file_name| + next if loaded.include?(file_name) + begin - silence_warnings { load("#{file_name}.rb") } unless loaded.include?(file_name) + silence_warnings { load("#{file_name}.rb") } loaded << file_name rescue LoadError # The association didn't reside in its own file, so we assume it was required by other means |