diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-13 18:59:01 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-13 18:59:01 +0000 |
commit | 56e3e2fde5f2b824df37fabc55db34f4ff337ebb (patch) | |
tree | 4f70dfd7cacd82789da6bfda24f5cf9f74609a0e /actionpack/lib/action_controller/session | |
parent | a303a168ac88d3c5e7a7e71a0c84ea3c2a44f972 (diff) | |
download | rails-56e3e2fde5f2b824df37fabc55db34f4ff337ebb.tar.gz rails-56e3e2fde5f2b824df37fabc55db34f4ff337ebb.tar.bz2 rails-56e3e2fde5f2b824df37fabc55db34f4ff337ebb.zip |
Always clear model associations from session. Closes #4795.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5512 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/session')
-rw-r--r-- | actionpack/lib/action_controller/session/drb_store.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_controller/session/mem_cache_store.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/session/drb_store.rb b/actionpack/lib/action_controller/session/drb_store.rb index 8ea23e8fff..4feb2636e7 100644 --- a/actionpack/lib/action_controller/session/drb_store.rb +++ b/actionpack/lib/action_controller/session/drb_store.rb @@ -26,6 +26,10 @@ class CGI #:nodoc:all def delete @@session_data.delete(@session_id) end + + def data + @@session_data[@session_id] + end end end end diff --git a/actionpack/lib/action_controller/session/mem_cache_store.rb b/actionpack/lib/action_controller/session/mem_cache_store.rb index a7076fcd5d..e62c0ef9cd 100644 --- a/actionpack/lib/action_controller/session/mem_cache_store.rb +++ b/actionpack/lib/action_controller/session/mem_cache_store.rb @@ -93,6 +93,10 @@ begin end @session_data = {} end + + def data + @session_data + end end end end |