diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-05 01:10:55 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-05 01:10:55 -0800 |
| commit | db619c4a4115d5eeca9473f8f77f34c877e4e1dd (patch) | |
| tree | 18c86d54f27884f5f03db0eba86665d4563cfa7e /actionpack/lib/action_controller/rescue.rb | |
| parent | ca54cc5df72a8bd7660d5be8333dcee2b6949257 (diff) | |
| download | rails-db619c4a4115d5eeca9473f8f77f34c877e4e1dd.tar.gz rails-db619c4a4115d5eeca9473f8f77f34c877e4e1dd.tar.bz2 rails-db619c4a4115d5eeca9473f8f77f34c877e4e1dd.zip | |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 8824d983b4..4b7d1e32fd 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -60,8 +60,8 @@ module ActionController #:nodoc: module ClassMethods def call_with_exception(env, exception) #:nodoc: - request = env["actioncontroller.rescue.request"] ||= Request.new(env) - response = env["actioncontroller.rescue.response"] ||= Response.new + request = env["action_controller.rescue.request"] ||= Request.new(env) + response = env["action_controller.rescue.response"] ||= Response.new new.process(request, response, :rescue_action, exception) end end |