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

Fix Set::merge() failing to merge correctly.

Browse source 
When merging 3 values, and the 2nd was empty, the resulting
merge was incorrect.

Fixes #3384
This commit is contained in:
mark_story 2012-11-19 14:03:03 -05:00
parent 4ebe754076
commit 6b4afb989e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Test/Case/Utility/SetTest.php
View file

@ -152,6 +152,9 @@ class SetTest extends CakeTestCase {
$r = Set::merge('foo', 'bar');
$this->assertEquals(array('foo', 'bar'), $r);
$r = Set::merge(array('foo'), array(), array('bar'));
$this->assertEquals(array('foo', 'bar'), $r);
$r = Set::merge('foo', array('user' => 'bob', 'no-bar'), 'bar');
$this->assertEquals(array('foo', 'user' => 'bob', 'no-bar', 'bar'), $r);

2
lib/Cake/Utility/Set.php
View file

@ -45,7 +45,7 @@ class Set {
*/
public static function merge($data, $merge = null) {
$args = func_get_args();
if (empty($args[1])) {
if (empty($args[1]) && count($args) <= 2) {
return (array)$args[0];
}
if (!is_array($args[0])) {