lib/rails/application.rb in railties-3.0.5 vs lib/rails/application.rb in railties-3.0.6.rc1

@@ -169,11 +169,12 @@
     end
 
     def env_defaults
       @env_defaults ||= {
         "action_dispatch.parameter_filter" => config.filter_parameters,
-        "action_dispatch.secret_token" => config.secret_token
+        "action_dispatch.secret_token" => config.secret_token,
+        "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
       }
     end
 
     def initializers
       initializers = Bootstrap.initializers_for(self)
@@ -189,10 +190,10 @@
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
         middleware.use ::ActionDispatch::Static, paths.public.to_a.first if config.serve_static_assets
         middleware.use ::Rack::Lock if !config.allow_concurrency
         middleware.use ::Rack::Runtime
         middleware.use ::Rails::Rack::Logger
-        middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local if config.action_dispatch.show_exceptions
+        middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
         middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
         middleware.use ::ActionDispatch::Callbacks, !config.cache_classes
         middleware.use ::ActionDispatch::Cookies