Added back special case for ApplicationController

rails · Nov 20, 2008 · 5e55ed1 · 5e55ed1
1 parent 8be7d96
commit 5e55ed1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/activesupport/lib/active_support/dependencies.rb b/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