Allow Rails controllers in too

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4520 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jun 30, 2006 · 14f11a7 · 14f11a7
1 parent bd01d40
commit 14f11a7
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
@@ -263,13 +263,12 @@ def traverse_to_controller(segments, start_at = 0)
         end
 
       protected
-
         def safe_load_paths #:nodoc:
           if defined?(RAILS_ROOT)
             $LOAD_PATH.select do |base|
               base = File.expand_path(base)
               extended_root = File.expand_path(RAILS_ROOT)
-              base[0, extended_root.length] == extended_root
+              base[0, extended_root.length] == extended_root || base =~ %r{rails-[\d.]+/builtin}
             end
           else
             $LOAD_PATH