Permalink
Browse files

Don't search a load-path of '.' for controller files, since it may in…

…clude 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
  • Loading branch information...
1 parent 9d17f88 commit d70d5219554b55b24586d559bd39d829317d523d @jamis jamis committed Jul 27, 2006
Showing with 3 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +1 −1 actionpack/lib/action_controller/routing.rb
View
@@ -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]
@@ -80,7 +80,7 @@ def possible_controllers
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|

0 comments on commit d70d521

Please sign in to comment.