Fixing notice errors caused by trying to operate on keys that don't e…

…xist. Fixes #1651
cakephp · May 31, 2011 · cd8b18d · cd8b18d
1 parent 9402f66
commit cd8b18d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
@@ -291,7 +291,9 @@ function delete($key) {
 			return;
 		}
 		$names = explode('.', $key, 2);
-		$this->__values[$names[0]] = Set::remove($this->__values[$names[0]], $names[1]);
+		if (isset($this->__values[$names[0]])) {
+			$this->__values[$names[0]] = Set::remove($this->__values[$names[0]], $names[1]);
+		}
 		$this->__delete('[' . implode('][', $names) . ']');
 	}
 

diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php
@@ -468,6 +468,16 @@ function testDeleteRemovesChildren() {
 		$this->Controller->Cookie->destroy();
 	}
 
+/**
+ * Test deleting recursively with keys that don't exist.
+ *
+ * @return void
+ */
+	function testDeleteChildrenNotExist() {
+		$this->assertNull($this->Controller->Cookie->delete('NotFound'));
+		$this->assertNull($this->Controller->Cookie->delete('Not.Found'));
+	}
+
 /**
  * encrypt method
  *