diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-29 10:04:42 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-29 10:04:42 +0200 |
| commit | 0bbf9029e8089356aed0e3be2f859d56951a89cf (patch) | |
| tree | 38e41ef8b63140a91c828bec03e06e83f38899b6 /actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | |
| parent | 006cef7107b648882cfc09f56904c601454cfc77 (diff) | |
| parent | 17599abc9c06f30ff23d7ad47a3f029e32c26c88 (diff) | |
| download | rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.gz rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.bz2 rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.zip | |
Merge remote branch 'miloops/warnings'
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/session/abstract_store.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 4 |
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 348a2d1eb2..ea49b30630 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -102,8 +102,8 @@ module ActionDispatch def destroy clear - @by.send(:destroy, @env) if @by - @env[ENV_SESSION_OPTIONS_KEY][:id] = nil if @env && @env[ENV_SESSION_OPTIONS_KEY] + @by.send(:destroy, @env) if defined?(@by) && @by + @env[ENV_SESSION_OPTIONS_KEY][:id] = nil if defined?(@env) && @env && @env[ENV_SESSION_OPTIONS_KEY] @loaded = false end |