From 12f99cd1e9334c8b0bb0191a277f1bb8a8917160 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sun, 25 Mar 2007 00:33:57 +0000
Subject: [PATCH] Adding fix for Ticket #2287

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4670 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/session.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index 7a4df68b3..502bce95c 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -391,6 +391,8 @@ class CakeSession extends Object {
 		if (isset($_COOKIE[session_name()])) {
 			setcookie(CAKE_SESSION_COOKIE, '', time() - 42000, $this->path);
 		}
+
+		$_SESSION = array();
 		$file = $sessionpath . DS . "sess_" . session_id();
 		@session_destroy();
 		@unlink ($file);
@@ -573,13 +575,15 @@ class CakeSession extends Object {
 		}
 		session_regenerate_id();
 		$newSessid = session_id();
-		$file = $sessionpath . DS . "sess_$oldSessionId";
-		@unlink ($file);
-		@session_destroy ($oldSessionId);
 
 		if (function_exists('session_write_close')) {
 			session_write_close();
 		}
+		session_id($oldSessionId);
+		session_start();
+		session_destroy();
+		$file = $sessionpath . DS . "sess_$oldSessionId";
+		@unlink($file);
 		$this->__initSession();
 		session_id ($newSessid);
 		session_start();
@@ -669,4 +673,4 @@ class CakeSession extends Object {
 		return true;
 	}
 }
-?>
+?>
\ No newline at end of file