TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Stop the flash middleware from forcibly loading sessions even if the user doesn't use sessions at all

Browse Source
This commit is contained in:
wycats 2010-06-04 10:03:53 -07:00
parent a260e02fd3
commit cb1b2a719a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/action_dispatch/middleware/flash.rb
View File

@ -170,13 +170,13 @@ def initialize(app)
end
def call(env)
if (session = env['rack.session']) && (flash = session['flash'])
if (session = env['rack.session']) && session.key?('flash')
flash.sweep
end
@app.call(env)
ensure
if (session = env['rack.session']) && (flash = session['flash']) && flash.empty?
if (session = env['rack.session']) && session.key?('flash') && session['flash'].empty?
session.delete('flash')
end
end

8
actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
View File

@ -51,11 +51,11 @@ def inspect
super
end
private
def loaded?
@loaded
end
def loaded?
@loaded
end
private
def load!
stale_session_check! do
id, session = @by.send(:load_session, @env)