Include all of session creation in stale_session_check
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2958 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
773b869088
commit
3661eacfbd
@ -95,12 +95,14 @@ def session
|
||||
if @session_options == false
|
||||
@session = Hash.new
|
||||
else
|
||||
if session_options_with_string_keys['new_session'] == true
|
||||
@session = new_session
|
||||
else
|
||||
@session = CGI::Session.new(@cgi, session_options_with_string_keys)
|
||||
stale_session_check! do
|
||||
if session_options_with_string_keys['new_session'] == true
|
||||
@session = new_session
|
||||
else
|
||||
@session = CGI::Session.new(@cgi, session_options_with_string_keys)
|
||||
end
|
||||
@session['__valid_session']
|
||||
end
|
||||
stale_session_check!
|
||||
end
|
||||
end
|
||||
@session
|
||||
@ -127,7 +129,7 @@ def new_session
|
||||
end
|
||||
|
||||
def stale_session_check!
|
||||
@session['__valid_session']
|
||||
yield
|
||||
rescue ArgumentError => argument_error
|
||||
if argument_error.message =~ %r{undefined class/module (\w+)}
|
||||
begin
|
||||
|
Loading…
Reference in New Issue
Block a user