adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-02 09:32:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.5

Browse source
This commit is contained in:
mark_story 2013-12-14 17:45:49 -05:00
commit c2b8778ce8
29 changed files with 150 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Utility/Hash.php
View file

@ -126,7 +126,7 @@ class Hash {
if ($conditions) {
$filter = array();
foreach ($next as $item) {
if (self::_matches($item, $conditions)) {
if (is_array($item) && self::_matches($item, $conditions)) {
$filter[] = $item;
}
}
@ -667,9 +667,7 @@ class Hash {
if (empty($data)) {
return false;
}
$values = array_values($data);
$str = implode('', $values);
return (bool)ctype_digit($str);
return $data === array_filter($data, 'is_numeric');
}
/**