aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-07-18 12:51:03 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-18 12:51:03 +0200
commit291adcd588e86746145e4ba9ab2ea4d0de26279f (patch)
treee5db71937e15fe14cae31aed990113b9ae0f79ba /actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
parentcdfa11409c6196d35e890cf1766e1e2cc6f3d7d7 (diff)
downloadrails-291adcd588e86746145e4ba9ab2ea4d0de26279f.tar.gz
rails-291adcd588e86746145e4ba9ab2ea4d0de26279f.tar.bz2
rails-291adcd588e86746145e4ba9ab2ea4d0de26279f.zip
Set session options id to nil is respected and cancels lazy loading.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/session/abstract_store.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/abstract_store.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 08c969c449..ad98249468 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -24,9 +24,9 @@ module ActionDispatch
def [](key)
if key == :id
- load_session_id! unless super(:id) || has_session_id?
+ load_session_id! unless key?(:id) || has_session_id?
end
- super(key)
+ super
end
private