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

Merge remote branch 'origin/1.2' into 1.3

Browse source 
Conflicts:
	cake/libs/cake_session.php
	cake/libs/controller/components/session.php
	cake/libs/model/model.php
	cake/libs/router.php
This commit is contained in:
Mark Story 2010-03-27 11:48:49 -04:00
commit 0c29fd0094
4 changed files with 130 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/set.php
View file

@ -437,7 +437,8 @@ class Set {
$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);
}
}