@@ -263,13 +263,12 @@ module ActionController 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 actionpack/lib/action_controller/routing.rb bd01d408a641c0ab3aec440dc26077abfeba164f David Heinemeier Hansson david@loudthinking.com http://github.com/rubyruy/rails/commit/14f11a73ed8cd50fa9075e3f068feaf3b89686ba 14f11a73ed8cd50fa9075e3f068feaf3b89686ba 2006-06-29T20:15:42-07:00 2006-06-29T20:15:42-07:00 Allow Rails controllers in too git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4520 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 098b279414d47e111dd4d828517e454ec2157bb3 David Heinemeier Hansson david@loudthinking.com