aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-21 17:29:59 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-21 17:29:59 -0600
commitf82e1046f893c80c6234495f1bca28b4fb6520c9 (patch)
treee7b1b81f5b19f877aca005f422fe626e64f603f1 /actionpack/lib/action_controller
parent3e33985e19a51a4ae824bc5765cbab84f5090021 (diff)
downloadrails-f82e1046f893c80c6234495f1bca28b4fb6520c9.tar.gz
rails-f82e1046f893c80c6234495f1bca28b4fb6520c9.tar.bz2
rails-f82e1046f893c80c6234495f1bca28b4fb6520c9.zip
reset_session needs to be a real method so flash can override it
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/rack_delegation.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index 5141918499..833475cff7 100644
--- a/actionpack/lib/action_controller/metal/rack_delegation.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -3,7 +3,7 @@ module ActionController
extend ActiveSupport::Concern
included do
- delegate :session, :reset_session, :to => "@_request"
+ delegate :session, :to => "@_request"
delegate :headers, :status=, :location=, :content_type=,
:status, :location, :content_type, :to => "@_response"
attr_internal :request
@@ -24,5 +24,9 @@ module ActionController
response.body = body if response
super
end
+
+ def reset_session
+ @_request.reset_session
+ end
end
end