Fixing formatting, and updating test to better reflect what would nor…

…mally happen.
cakephp · Apr 16, 2011 · 4395e8a · 4395e8a
1 parent 13c64f1
commit 4395e8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
@@ -281,8 +281,8 @@ function delete($key) {
 			$this->read();
 		}
 		if (strpos($key, '.') === false) {
-			if(isset($this->__values[$key]) && is_array($this->__values[$key])) {
-				foreach($this->__values[$key] as $idx => $val) {
+			if (isset($this->__values[$key]) && is_array($this->__values[$key])) {
+				foreach ($this->__values[$key] as $idx => $val) {
 					$this->__delete("[$key][$idx]");
 				}
 			} else {

diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php
@@ -456,7 +456,10 @@ function testNoErrorOnNonArrayData() {
  * @return void
  */
 	function testDeleteRemovesChildren() {
-		$_COOKIE['CakeTestCookie'] = array('User' => array('email' => 'example@example.com', 'name' => 'mark'));
+		$_COOKIE['CakeTestCookie'] = array(
+			'User' => array('email' => 'example@example.com', 'name' => 'mark'),
+			'other' => 'value'
+		);
 		$this->Controller->Cookie->startup();
 		$this->assertEqual('mark', $this->Controller->Cookie->read('User.name'));