diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
| commit | 435b088f5aa5d6bc38369dd9c9d067e21e5b7de1 (patch) | |
| tree | 3f64164d58791c4762c5fc5d4ca5240e0aecfebf /actionpack/lib | |
| parent | 6ff506ffbc438a92cb6d3cb4351a0a463d57424a (diff) | |
| parent | fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69 (diff) | |
| download | rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.gz rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.bz2 rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 2d5e80f0bb..d93edf067c 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -12,14 +12,7 @@ module ActionController after_dispatch :cleanup_application end - # Common callbacks - to_prepare :load_application_controller do - begin - require_dependency 'application' unless defined?(::ApplicationController) - rescue LoadError => error - raise unless error.message =~ /application\.rb/ - end - end + to_prepare(:load_application_controller) { ApplicationController } if defined?(ActiveRecord) after_dispatch :checkin_connections |