diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-03-04 11:58:30 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-04 11:58:30 -0800 |
| commit | 17769696279810c6c24a10b0d47f9b712205f0ce (patch) | |
| tree | 86093a3cfed5e3bcac393284f79b4f9c046d0250 /railties/lib/rails/railtie | |
| parent | c0c1599fb15fa4bb9f311c92c88d7c83795388fb (diff) | |
| download | rails-17769696279810c6c24a10b0d47f9b712205f0ce.tar.gz rails-17769696279810c6c24a10b0d47f9b712205f0ce.tar.bz2 rails-17769696279810c6c24a10b0d47f9b712205f0ce.zip | |
Move session and session_store onto ActionDispatch and add deprecation warnings
Diffstat (limited to 'railties/lib/rails/railtie')
| -rw-r--r-- | railties/lib/rails/railtie/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb index 76384398ab..28d7b2f9ae 100644 --- a/railties/lib/rails/railtie/configuration.rb +++ b/railties/lib/rails/railtie/configuration.rb @@ -86,8 +86,8 @@ module Rails middleware.use('::Rack::Sendfile', lambda { action_dispatch.x_sendfile_header }) middleware.use('::ActionDispatch::Callbacks', lambda { !cache_classes }) middleware.use('::ActionDispatch::Cookies') - middleware.use(lambda { ActionController::SessionManagement.session_store_for(action_controller.session_store) }, lambda { action_controller.session }) - middleware.use('::ActionDispatch::Flash', :if => lambda { action_controller.session_store }) + middleware.use(lambda { ActionController::SessionManagement.session_store_for(action_dispatch.session_store) }, lambda { action_dispatch.session }) + middleware.use('::ActionDispatch::Flash', :if => lambda { action_dispatch.session_store }) middleware.use(lambda { metal_loader.build_middleware(metals) }, :if => lambda { metal_loader.metals.any? }) middleware.use('ActionDispatch::ParamsParser') middleware.use('::Rack::MethodOverride') |