From 75bfbe0e377302e16175c185c878531fd14c2c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?=
 <jose.zap@gmail.com>
Date: Tue, 21 Dec 2010 22:24:55 -0430
Subject: [PATCH] Fixing Set::merge, broken in previous optimizations

---
 lib/Cake/Utility/Set.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php
index b30f8f3e7..18acbe053 100644
--- a/lib/Cake/Utility/Set.php
+++ b/lib/Cake/Utility/Set.php
@@ -46,7 +46,7 @@ class Set {
 		$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;