diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-04 20:12:27 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-04 20:12:27 +0200 |
| commit | afc3ccf74cbb6c3d495558e934ced1c006dacda8 (patch) | |
| tree | efba9364ac490d6466a0094da6ab2ce2a131a102 /actionpack/lib/action_dispatch | |
| parent | 6b79463ed8d04c7807c0695fcb3d4c11e4be9fa2 (diff) | |
| download | rails-afc3ccf74cbb6c3d495558e934ced1c006dacda8.tar.gz rails-afc3ccf74cbb6c3d495558e934ced1c006dacda8.tar.bz2 rails-afc3ccf74cbb6c3d495558e934ced1c006dacda8.zip | |
Fix renew feature on cookies.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/cookie_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb index 9c9ccc62f5..8ebf870b95 100644 --- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb @@ -59,7 +59,7 @@ module ActionDispatch end def set_session(env, sid, session_data, options) - persistent_session_id!(session_data, sid) + session_data.merge("session_id" => sid) end def set_cookie(env, session_id, cookie) |