Permalink
Browse files

Allow Rails controllers in too

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4520 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent bd01d40 commit 14f11a73ed8cd50fa9075e3f068feaf3b89686ba @dhh dhh committed Jun 30, 2006
Showing with 1 addition and 2 deletions.
  1. +1 −2 actionpack/lib/action_controller/routing.rb
View
3 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

0 comments on commit 14f11a7

Please sign in to comment.