Merge remote-tracking branch 'upstream/pull/4968'

[rails.git] / lib / session_persistence.rb

diff --git a/lib/session_persistence.rb b/lib/session_persistence.rb
index 5e933f48a39151360ad45616866d13e8cbecb3c1..0a9f1d2f1de13f75a8ebae1fd96d10b5951a7fb5 100644 (file)
--- a/lib/session_persistence.rb
+++ b/lib/session_persistence.rb
@@ -25,6 +25,7 @@ module SessionPersistence
 
     # Install filter when we are included
     def included(controller)
 
     # Install filter when we are included
     def included(controller)

+      super

       controller.after_action :persist_session
     end
   end
       controller.after_action :persist_session
     end
   end


@@ -52,9 +53,7 @@ module SessionPersistence
 
   # Filter callback
   def persist_session
 
   # Filter callback
   def persist_session

-    if session[session_persistence_key]
-      request.session_options[:expire_after] = session[session_persistence_key]
-    end
+    request.session_options[:expire_after] = session[session_persistence_key] if session[session_persistence_key]

   rescue StandardError
     reset_session
   end
   rescue StandardError
     reset_session
   end