diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-22 16:57:45 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-22 17:05:44 -0700 |
commit | f9dde8fe4e14e7750e9a00c666b052bb409ead05 (patch) | |
tree | b9cbb097c0f9b44ec0ba2b5a902a39e615d54986 /actionpack/lib | |
parent | c90f613ad68253cb253bf47cb812f9e027c35d10 (diff) | |
download | rails-f9dde8fe4e14e7750e9a00c666b052bb409ead05.tar.gz rails-f9dde8fe4e14e7750e9a00c666b052bb409ead05.tar.bz2 rails-f9dde8fe4e14e7750e9a00c666b052bb409ead05.zip |
Port cookies to new base
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/new_base.rb | 3 | ||||
-rw-r--r-- | actionpack/lib/action_controller/new_base/base.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb index ad0e07e261..276be50614 100644 --- a/actionpack/lib/action_controller/new_base.rb +++ b/actionpack/lib/action_controller/new_base.rb @@ -35,9 +35,10 @@ module ActionController autoload :HttpAuthentication, 'action_controller/base/http_authentication' autoload :FilterParameterLogging, 'action_controller/base/filter_parameter_logging' autoload :Translation, 'action_controller/translation' + autoload :Cookies, 'action_controller/base/cookies' require 'action_controller/routing' end require 'action_dispatch' -require 'action_view'
\ No newline at end of file +require 'action_view' diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb index 85354bfea3..e321d97ac1 100644 --- a/actionpack/lib/action_controller/new_base/base.rb +++ b/actionpack/lib/action_controller/new_base/base.rb @@ -26,6 +26,7 @@ module ActionController # Rails 2.x compatibility include ActionController::Rails2Compatibility + include ActionController::Cookies include ActionController::Session include ActionController::Flash include ActionController::Verification |