From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Sep 2010 21:40:12 +0000 (+0100)
Subject: Go back to the rails 3 based upstream version of session-persistence
X-Git-Tag: live~6163
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b2e9d8176b1e66356330230ee892d7204dd8eeca?ds=sidebyside

Go back to the rails 3 based upstream version of session-persistence
---

diff --git a/vendor/plugins/session-persistence/lib/session_persistence.rb b/vendor/plugins/session-persistence/lib/session_persistence.rb
index 2fac60332..7bb51bc46 100644
--- a/vendor/plugins/session-persistence/lib/session_persistence.rb
+++ b/vendor/plugins/session-persistence/lib/session_persistence.rb
@@ -22,8 +22,7 @@ module SessionPersistence
   
   def _persist_session
     if session[session_persistence_key]
-      request.session_options[:expires] = Time.now + session[session_persistence_key]
-      request.session_options[:expire_after] = session[session_persistence_key]
+      env["rack.session.options"][:expire_after] = session[session_persistence_key]
     end
   end
 end