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

When merging 3 values, and the 2nd was empty, the resulting merge was incorrect. Fixes #3384
cakephp · Nov 19, 2012 · 6b4afb9 · 6b4afb9
1 parent 4ebe754
commit 6b4afb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/SetTest.php b/lib/Cake/Test/Case/Utility/SetTest.php
@@ -152,6 +152,9 @@ public function testMerge() {
 		$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);
 

diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php
@@ -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])) {