From 860b79b6446e0cd60f7e93a7be96c3ce94a668b0 Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Wed, 25 Oct 2006 09:52:53 +0000
Subject: - Patch #87372 by drumm: Broken login

---
 includes/session.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/session.inc b/includes/session.inc
index 4c939ccac..7b64dbbaf 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -84,7 +84,6 @@ function sess_write($key, $value) {
  */
 function sess_regenerate() {
   $old_session_id = session_id();
-  session_regenerate_id();
 
   // We code around http://bugs.php.net/bug.php?id=32802 by destroying
   // the session cookie by setting expiration in the past (a negative
@@ -95,6 +94,8 @@ function sess_regenerate() {
     setcookie(session_name(), '', time() - 42000, '/');
   }
 
+  session_regenerate_id();
+
   db_query("UPDATE {sessions} SET sid = '%s' WHERE sid = '%s'", session_id(), $old_session_id);
 }
 
-- 
cgit v1.2.3