Remove global exception catching from ApplicationController.

It was severely broken since it was ported to NewBase and is causing problems with normal exception catching. A replacement is coming soon.

1 files changed, 4 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller/dispatch/middlewares.rb b/actionpack/lib/action_controller/dispatch/middlewares.rb
index b25ed3fd3f..5641b3cb8d 100644
--- a/actionpack/lib/action_controller/dispatch/middlewares.rb
+++ b/actionpack/lib/action_controller/dispatch/middlewares.rb
@@ -4,15 +4,13 @@ use "Rack::Lock", :if => lambda {
 
 use "ActionDispatch::ShowExceptions", lambda { ActionController::Base.consider_all_requests_local }
 use "ActionDispatch::Callbacks", lambda { ActionController::Dispatcher.prepare_each_request }
-use "ActionDispatch::Rescue", lambda {
-  controller = (::ApplicationController rescue ActionController::Base)
-  # TODO: Replace with controller.action(:_rescue_action)
-  controller.method(:rescue_action)
-}
+
+# TODO: Redirect global exceptions somewhere?
+# use "ActionDispatch::Rescue"
 
 use lambda { ActionController::Base.session_store },
     lambda { ActionController::Base.session_options }
 
 use "ActionDispatch::ParamsParser"
 use "Rack::MethodOverride"
-use "Rack::Head"
\ No newline at end of file
+use "Rack::Head"