Permalink
Browse files

Added back special case for ApplicationController

  • Loading branch information...
1 parent 8be7d96 commit 5e55ed19510b6d008144282860e5d549c1c3671e @dhh dhh committed Nov 20, 2008
Showing with 6 additions and 1 deletion.
  1. +6 −1 activesupport/lib/active_support/dependencies.rb
@@ -319,7 +319,12 @@ def loadable_constants_for_path(path, bases = load_paths)
rescue NameError
next
end
- [ nesting_camel ]
+
+ [
+ nesting.camelize,
+ # Special case: application.rb might define ApplicationControlller.
+ ('ApplicationController' if nesting == 'application')
+ ]
end.flatten.compact.uniq
end

0 comments on commit 5e55ed1

Please sign in to comment.