adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor simplification.

Browse source
This commit is contained in:
mark_story 2013-08-24 21:49:17 -04:00
parent 074fced586
commit f655e8a7bc
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -250,12 +250,11 @@ class Hash {
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
if (self::_matchToken($k, $token)) { if (self::_matchToken($k, $token)) {
if ($conditions) { if ($conditions && self::_matches($v, $conditions)) {
if (self::_matches($v, $conditions)) {
$data[$k] = array_merge($v, $values); $data[$k] = array_merge($v, $values);
continue; continue;
} }
} else { if (!$conditions) {
$data[$k] = self::insert($v, $nextPath, $values); $data[$k] = self::insert($v, $nextPath, $values);
} }
} }