Making CakeSession destory() make started() not return true. Fixing t…

…ests that tried to modify session config while a session was active.
cakephp · Jul 28, 2010 · f47ee0d · f47ee0d
1 parent daab018
commit f47ee0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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();