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

[rails.git] / lib / session_persistence.rb

diff --git a/lib/session_persistence.rb b/lib/session_persistence.rb
index 5e933f48a39151360ad45616866d13e8cbecb3c1..6bd05f5ce7fb58a74ad013c95f23f9d8d3e822c7 100644 (file)
--- a/lib/session_persistence.rb
+++ b/lib/session_persistence.rb
@@ -52,9 +52,7 @@ module SessionPersistence
 
   # 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