From f47ee0d29aabf76323b31f69cf3273b0e0b8015d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 7 Jul 2010 23:40:33 -0400
Subject: [PATCH] Making CakeSession destory() make started() not return true. 
 Fixing tests that tried to modify session config while a session was active.

---
 cake/libs/cake_session.php                  | 2 +-
 cake/tests/cases/libs/cake_session.test.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index 517aad9cae3..ad44a57eee3 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -445,7 +445,7 @@ public static function write($name, $value) {
  * @return void
  */
 	public function destroy() {
-		$_SESSION = array();
+		$_SESSION = null;
 		self::$id = null;
 		self::init(self::$path);
 		self::start();
diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php
index 5a39d66f200..9b1876bf40f 100644
--- a/cake/tests/cases/libs/cake_session.test.php
+++ b/cake/tests/cases/libs/cake_session.test.php
@@ -366,6 +366,7 @@ function testCheckUserAgentTrue() {
  * @return void
  */
 	function testReadAndWriteWithCakeStorage() {
+		session_write_close();
 		ini_set('session.save_handler', 'files');
 		Configure::write('Session.save', 'cake');
 		$this->setUp();
@@ -401,6 +402,7 @@ function testReadAndWriteWithCakeStorage() {
  * @return void
  */
 	function testReadAndWriteWithCacheStorage() {
+		session_write_close();
 		ini_set('session.save_handler', 'files');
 		Configure::write('Session.save', 'cache');
 		$this->setUp();