Fix diagnostics page for routing errors.

2 files changed, 2 insertions, 9 deletions

diff --git a/actionpack/lib/action_controller/metal/rescue.rb b/actionpack/lib/action_controller/metal/rescue.rb
index 736ff5b31c..c4b056ebc0 100644
--- a/actionpack/lib/action_controller/metal/rescue.rb
+++ b/actionpack/lib/action_controller/metal/rescue.rb
@@ -3,11 +3,6 @@ module ActionController #:nodoc:
     extend ActiveSupport::Concern
     include ActiveSupport::Rescuable
 
-    included do
-      config_accessor :consider_all_requests_local
-      self.consider_all_requests_local = false if consider_all_requests_local.nil?
-    end
-
     def rescue_with_handler(exception)
       if (exception.respond_to?(:original_exception) &&
           (orig_exception = exception.original_exception) &&
@@ -18,14 +13,14 @@ module ActionController #:nodoc:
     end
 
     def show_detailed_exceptions?
-      consider_all_requests_local || request.local?
+      request.local?
     end
 
     private
       def process_action(*args)
         super
       rescue Exception => exception
-        request.env['action_dispatch.show_detailed_exceptions'] = show_detailed_exceptions?
+        request.env['action_dispatch.show_detailed_exceptions'] ||= show_detailed_exceptions?
         rescue_with_handler(exception) || raise(exception)
       end
   end
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index cb2e2b17aa..7af256fd99 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -21,8 +21,6 @@ module ActionController
       paths   = app.config.paths
       options = app.config.action_controller
 
-      options.consider_all_requests_local ||= app.config.consider_all_requests_local
-
       options.assets_dir           ||= paths["public"].first
       options.javascripts_dir      ||= paths["public/javascripts"].first
       options.stylesheets_dir      ||= paths["public/stylesheets"].first