From bdb1f2f3b68cc23714a05bc815bcf8e759ee03dc Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Mon, 2 Feb 2015 12:10:04 +0200 Subject: [PATCH] improved Util::merge() functionality --- application/Espo/Core/Utils/Util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Espo/Core/Utils/Util.php b/application/Espo/Core/Utils/Util.php index 89630dffeb..f9f7a83320 100644 --- a/application/Espo/Core/Utils/Util.php +++ b/application/Espo/Core/Utils/Util.php @@ -159,7 +159,7 @@ class Util if ($appendKey !== false) { unset($newValue[$appendKey]); $newValue = array_merge($currentArray[$newName], $newValue); - } else if (!static::isSingleArray($newValue)) { + } else if (!static::isSingleArray($newValue) || !static::isSingleArray($currentArray[$newName])) { $newValue = static::merge($currentArray[$newName], $newValue); }