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

Fixing extraction of non-zero arrays with only one element and attribute selectors. Fixes #475

Browse source
This commit is contained in:
Mark Story 2010-03-24 23:25:02 -04:00
parent cbb65ca85f
commit 4f4d3f9ffe
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/set.php
View file

@ -438,7 +438,8 @@ class Set extends Object {
$items = array($items);
} elseif (!isset($items[0])) {
$current = current($items);
if ((is_array($current) && count($items) <= 1) || !is_array($current)) {
$currentKey = key($items);
if (!is_array($current) || (is_array($current) && count($items) <= 1 && !is_numeric($currentKey))) {
$items = array($items);
}
}

4
cake/tests/cases/libs/set.test.php
View file

@ -1035,10 +1035,10 @@ class SetTest extends CakeTestCase {
$result = Set::extract('/User/id', $nonZero);
$this->assertEqual($result, $expected, 'Failed non zero array key extract');
$startingAtOne = array(
'Article' => array(
1=> array(
1 => array(
'id' => 1,
'approved' => 1,
),