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 /actionpack/lib/action_controller/metal | |
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 'actionpack/lib/action_controller/metal')
-rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 6 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/session_management.rb | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 4c2136de8a..024c58ffc4 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -158,6 +158,12 @@ module ActionController Rails.application.config.action_dispatch.ip_spoofing_check = value end + def session=(value) + ActiveSupport::Deprecation.warn "ActionController::Base.session= is deprecated. " << + "Please configure it on your application with config.action_dispatch.session=", caller + Rails.application.config.action_dispatch.session = value.delete(:disabled) ? nil : value + end + def rescue_action(env) raise env["action_dispatch.rescue.exception"] end diff --git a/actionpack/lib/action_controller/metal/session_management.rb b/actionpack/lib/action_controller/metal/session_management.rb index ce8b20964b..1ea22b7b28 100644 --- a/actionpack/lib/action_controller/metal/session_management.rb +++ b/actionpack/lib/action_controller/metal/session_management.rb @@ -27,11 +27,6 @@ module ActionController #:nodoc: SessionManagement.session_store_for(config.session_store) end - def session=(options = {}) - self.session_store = nil if options.delete(:disabled) - session_options.merge!(options) - end - def session(*args) ActiveSupport::Deprecation.warn( "Disabling sessions for a single controller has been deprecated. " + |