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

Fix maxDimensions() for empty/1 dimensional arrays.

Browse source 
maxDimensions() should not emit warnings or mis-calculate an array's
dimensions.

Fixes #6224
This commit is contained in:
mark_story 2015-03-31 22:21:15 -04:00
parent 758820d7cc
commit 69971505a2
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -763,10 +763,14 @@ class Hash {
$depth = array();
if (is_array($data) && reset($data) !== false) {
foreach ($data as $value) {
$depth[] = self::dimensions((array)$value) + 1;
if (is_array($value)) {
$depth[] = self::dimensions($value) + 1;
} else {
$depth[] = 1;
}
}
}
return max($depth);
return empty($depth) ? 0 : max($depth);
}
/**