diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php index bfd270185..b2ca100df 100644 --- a/cake/libs/controller/components/cookie.php +++ b/cake/libs/controller/components/cookie.php @@ -281,8 +281,8 @@ class CookieComponent extends Object { $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 index a9385a2c2..868eee124 100644 --- a/cake/tests/cases/libs/controller/components/cookie.test.php +++ b/cake/tests/cases/libs/controller/components/cookie.test.php @@ -456,7 +456,10 @@ class CookieComponentTest extends CakeTestCase { * @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'));