Permalink
Browse files

Minor tweaks

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@428 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 9a33b9a commit 394cf21ce73cae503f4c5272ef2a417df6fd21a5 @dhh dhh committed Jan 16, 2005
Showing with 4 additions and 1 deletion.
  1. +1 −0 activesupport/lib/core_ext/string/inflections.rb
  2. +3 −1 activesupport/lib/dependencies.rb
@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + '/../../inflector'
module ActiveSupport
module CoreExtensions
module String
@@ -30,8 +30,10 @@ def reload
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

0 comments on commit 394cf21

Please sign in to comment.