diff options
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 05e9886ab0..e983912158 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -101,7 +101,7 @@ module ActionController #:nodoc: end def session - unless @session + unless defined?(@session) if @session_options == false @session = Hash.new else @@ -119,7 +119,7 @@ module ActionController #:nodoc: end def reset_session - @session.delete if CGI::Session === @session + @session.delete if defined?(@session) && @session.is_a?(CGI::Session) @session = new_session end |