From 2650c3a582545feaa4d6c2763a92b0cfd46247df Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Thu, 22 Feb 2007 19:53:25 +0000
Subject: [PATCH] Finished retro-fitting CakeSession::del() (Ticket #2163)

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

diff --git a/cake/libs/session.php b/cake/libs/session.php
index 4e03b0091..d52787210 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -201,15 +201,13 @@ class CakeSession extends Object {
  */
 	function del($name) {
 		if ($this->check($name)) {
-			$var = $this->__sessionVarNames($name);
-			if (empty($var)) {
-				return false;
+			if ($var = $this->__validateKeys($name)) {
+				if (in_array($var, $this->watchKeys)) {
+					trigger_error('Deleting session key {' . $var . '}', E_USER_NOTICE);
+				}
+				$this->__overwrite($_SESSION, Set::remove($_SESSION, $var));
+				return ($this->check($var) == false);
 			}
-			if (in_array($var, $this->watchKeys)) {
-				trigger_error('Deleting session key {' . $var . '}', E_USER_NOTICE);
-			}
-			$this->__overwrite($_SESSION, Set::remove($_SESSION, $var));
-			return ($this->check($var) == false);
 		}
 		$this->__setError(2, "$name doesn't exist");
 		return false;