aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-20 13:47:57 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-20 13:47:57 +0000
commitbeb2875094d8038b1d5d8fc1a5943884cf96ccf4 (patch)
tree5e45015a194953e8b96b28f0cbc5e0445491cef1 /railties
parent5fa66cd45c5264080a36d49c9ba803cf2fa3b51b (diff)
downloadrails-beb2875094d8038b1d5d8fc1a5943884cf96ccf4.tar.gz
rails-beb2875094d8038b1d5d8fc1a5943884cf96ccf4.tar.bz2
rails-beb2875094d8038b1d5d8fc1a5943884cf96ccf4.zip
Updated dependency loading to consider non-standard class/file name combinations
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@712 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 6456ea25dc..33f1e8d1cd 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -41,7 +41,7 @@ class Dispatcher
def prepare_application
ActionController::Routing::Routes.reload if Dependencies.load?
Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT)
- Controllers.const_load!("application") unless Controllers.const_defined?(:ApplicationController)
+ Controllers.const_load!(:ApplicationController, "application") unless Controllers.const_defined?(:ApplicationController)
end
def reset_application