Merge branch 'master' into openid

[rails.git] / vendor / plugins / session-persistence / lib / session_persistence.rb

diff --git a/vendor/plugins/session-persistence/lib/session_persistence.rb b/vendor/plugins/session-persistence/lib/session_persistence.rb
index 50e30c0f131fac8055ad372a780a495055a627fe..2fac6033257c89b8fe9762e19e0351aa0cb42c9d 100644 (file)
--- a/vendor/plugins/session-persistence/lib/session_persistence.rb
+++ b/vendor/plugins/session-persistence/lib/session_persistence.rb
@@ -22,9 +22,8 @@ module SessionPersistence
   
   def _persist_session
     if session[session_persistence_key]
   
   def _persist_session
     if session[session_persistence_key]

-      request.session_options = request.session_options.dup
+      request.session_options[:expires] = Time.now + session[session_persistence_key]

       request.session_options[:expire_after] = session[session_persistence_key]
       request.session_options[:expire_after] = session[session_persistence_key]

-      request.session_options.freeze

     end
   end
 end
     end
   end
 end