josh / rails fork watch download tarball
public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/josh/rails.git 
Minor tweaks

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@428 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
dhh (author)
Sun Jan 16 05:07:28 -0800 2005
commit  394cf21ce73cae503f4c5272ef2a417df6fd21a5
tree    0e093139077676ba2744119d7e24f1cffb8f142a
parent  9a33b9a73745401c1c715ee65f7e30f029d3e6a7
0
activesupport/lib/core_ext/string/inflections.rb 
...
 
1
2
3
 
...
1
2
3
4
 
0
@@ -1,3 +1,4 @@
0
+require File.dirname(__FILE__) + '/../../inflector'
0
 module ActiveSupport
0
   module CoreExtensions
0
     module String
0
activesupport/lib/dependencies.rb 
...
30
31
32
 
 
33
34
 
35
36
37
 
...
30
31
32
33
34
35
 
36
37
38
39
 
0
@@ -30,8 +30,10 @@ module Dependencies
0
     clear
0
     
0
     old_loaded.each do |file_name| 
0
+      next if loaded.include?(file_name)
0
+
0
       begin
0
-        silence_warnings { load("#{file_name}.rb") } unless loaded.include?(file_name)
0
+        silence_warnings { load("#{file_name}.rb") }
0
         loaded << file_name
0
       rescue LoadError
0
         # The association didn't reside in its own file, so we assume it was required by other means

Comments

    No one has commented yet.