From 2a29738dc1240b534c1eb1e60472e42168ee5d05 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 31 Jan 2011 11:50:24 -0800 Subject: [PATCH] Revert "Session GC fix: save session.modified field as UTC so our comparisons work." - no longer needed with ticket #3020 fix to time zone settings This reverts commit a7abb2323e7d57125b9fbc903a1cecc06c27944e. --- classes/Session.php | 2 -- classes/statusnet.ini | 15 +-------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/classes/Session.php b/classes/Session.php index b9daf364db..166b89815a 100644 --- a/classes/Session.php +++ b/classes/Session.php @@ -87,7 +87,6 @@ class Session extends Memcached_DataObject $session->id = $id; $session->session_data = $session_data; $session->created = common_sql_now(); - $session->modified = common_sql_now(); $result = $session->insert(); @@ -109,7 +108,6 @@ class Session extends Memcached_DataObject $orig = clone($session); $session->session_data = $session_data; - $session->modified = common_sql_now(); $result = $session->update($orig); diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 29fde93b5d..ef631e28d3 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -513,20 +513,7 @@ profile_id = K id = 130 session_data = 34 created = 142 -modified = 142 -; Warning: using DB_DATAOBJECT_MYSQLTIMESTAMP (256) causes DB_DataObject -; to SILENTLY REMOVE ATTEMPTS TO SET THIS FIELD DIRECTLY, which is pretty -; bad because the default behavior for auto-updated TIMESTAMP fields is -; to use local time. Local time can't be compared to UTC in any useful -; way, so doing that breaks session GC. -; -; Instead we'll use the plain datetime settings so it'll actually save the -; UTC value we provide when updating. -; -; Long-term fix: punch MySQL in the face until it understands that local -; time is a tool of the cyber-devil. -; -;modified = 384 +modified = 384 [session__keys] id = K