From d70d5219554b55b24586d559bd39d829317d523d Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Thu, 27 Jul 2006 15:31:07 +0000 Subject: Don't search a load-path of '.' for controller files, since it may include symlinks to all kinds of things and result in far too many irrelevant files being considered git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4625 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_controller/routing.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c8106f0df8..a5d1d2a771 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Don't search a load-path of '.' for controller files [Jamis Buck] + * Update integration.rb to require test_process explicitly instead of via Dependencies. [Nicholas Seckar] * Fixed that you can still access the flash after the flash has been reset in reset_session. Closes #5584 [lmarlow@yahoo.com] diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index a91019d418..835758675e 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -80,7 +80,7 @@ module ActionController unless @possible_controllers @possible_controllers = [] - paths = $LOAD_PATH.select { |path| File.directory? path } + paths = $LOAD_PATH.select { |path| File.directory?(path) && path != "." } seen_paths = Hash.new {|h, k| h[k] = true; false} normalize_paths(paths).each do |load_path| -- cgit v1.2.3