Fixing Set::merge, broken in previous optimizations

cakephp · Dec 22, 2010 · 75bfbe0 · 75bfbe0
1 parent 6bd7359
commit 75bfbe0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php
@@ -46,7 +46,7 @@ public static function merge($arr1, $arr2 = null) {
 		$r = (array)current($args);
 		while (($arg = next($args)) !== false) {
 			foreach ((array)$arg as $key => $val)	 {
-				if (!empty($r[$key]) && is_array($r[$key])) {
+				if (!empty($r[$key]) && is_array($r[$key]) && is_array($val)) {
 					$r[$key] = Set::merge($r[$key], $val);
 				} elseif (is_int($key)) {
 					$r[] = $val;