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

2 files changed, 6 insertions, 6 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index adde183cdb..043966a585 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -170,13 +170,13 @@ module ActionDispatch
     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
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 15493cd2eb..3e8d64b0c6 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -51,11 +51,11 @@ module ActionDispatch
           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)