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

Merge branch '2.0' into 2.1

Browse source 
Conflicts:
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/basics.php
This commit is contained in:
mark_story 2012-01-08 21:59:18 -05:00
commit 0e56d742b8
14 changed files with 206 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Core/Configure.php
View file

@ -312,7 +312,7 @@ class Configure {
$keys = array_keys($values);
foreach ($keys as $key) {
if (($c = self::read($key)) && is_array($values[$key]) && is_array($c)) {
$values[$key] = array_merge_recursive($c, $values[$key]);
$values[$key] = Set::merge($c, $values[$key]);
}
}
}