fixing bug in Hash where array is not similar to the path required

cakephp · Dec 14, 2012 · 2266292 · 2266292
1 parent 6f5ff4d
commit 2266292
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php
@@ -659,6 +659,9 @@ public function testExtractBasic() {
 
 		$result = Hash::extract($data, '1.Article.title');
 		$this->assertEquals(array('Second Article'), $result);
+
+		$result = Hash::extract(array(false), '{n}.Something.another_thing');
+		$this->assertEquals(array(), $result);
 	}
 
 /**

diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php
@@ -117,7 +117,7 @@ public static function extract(array $data, $path) {
 			}
 
 			foreach ($context[$_key] as $item) {
-				foreach ($item as $k => $v) {
+				foreach ((array)$item as $k => $v) {
 					if (self::_matchToken($k, $token)) {
 						$next[] = $v;
 					}