diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-21 01:38:48 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-21 01:41:35 +0200 |
| commit | 8e7a87d299483fce6af3be89e50deae43055a96f (patch) | |
| tree | 3d5b2e2ca99ad1705ce09d8620bbcf0f9106ee22 /actionpack/lib/action_controller/new_base | |
| parent | 205cfe2163d9eb6ee801a23f550e960136b5680e (diff) | |
| download | rails-8e7a87d299483fce6af3be89e50deae43055a96f.tar.gz rails-8e7a87d299483fce6af3be89e50deae43055a96f.tar.bz2 rails-8e7a87d299483fce6af3be89e50deae43055a96f.zip | |
Make ActionController::Flash work with new_base
Diffstat (limited to 'actionpack/lib/action_controller/new_base')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/base.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/new_base/http.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/new_base/session.rb | 11 |
3 files changed, 15 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb index 3d8d46c9c2..eff7297973 100644 --- a/actionpack/lib/action_controller/new_base/base.rb +++ b/actionpack/lib/action_controller/new_base/base.rb @@ -14,6 +14,9 @@ module ActionController include ActionController::Layouts include ActionController::ConditionalGet + include ActionController::Session + include ActionController::Flash + # Legacy modules include SessionManagement include ActionDispatch::StatusCodes diff --git a/actionpack/lib/action_controller/new_base/http.rb b/actionpack/lib/action_controller/new_base/http.rb index 17466a2d52..2525e221a6 100644 --- a/actionpack/lib/action_controller/new_base/http.rb +++ b/actionpack/lib/action_controller/new_base/http.rb @@ -37,7 +37,7 @@ module ActionController end delegate :headers, :to => "@_response" - + def params @_params ||= @_request.parameters end diff --git a/actionpack/lib/action_controller/new_base/session.rb b/actionpack/lib/action_controller/new_base/session.rb new file mode 100644 index 0000000000..a8715555fb --- /dev/null +++ b/actionpack/lib/action_controller/new_base/session.rb @@ -0,0 +1,11 @@ +module ActionController + module Session + def session + @_request.session + end + + def reset_session + @_request.reset_session + end + end +end |