From 135c4ca5e01cb89c4ac7b807b006cb9cdb54b4ee Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@letrium.com>
Date: Thu, 28 Nov 2013 14:03:05 +0200
Subject: [PATCH] fix problem with empty json {}

---
 application/Espo/Core/Utils/File/UniteFiles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/Espo/Core/Utils/File/UniteFiles.php b/application/Espo/Core/Utils/File/UniteFiles.php
index 53a9490cfb..4ac81c7850 100644
--- a/application/Espo/Core/Utils/File/UniteFiles.php
+++ b/application/Espo/Core/Utils/File/UniteFiles.php
@@ -144,7 +144,7 @@ class UniteFiles
 		$fileContent= $this->getFileManager()->getContent($folderPath, $fileName);
 		$decoded= Utils\Json::getArrayData($fileContent);
 
-		if (empty($decoded)) {
+		if (empty($decoded) && !is_array($decoded)) {
         	$GLOBALS['log']->add('FATAL EXCEPTION', 'Syntax error or empty file - '.Utils\Util::concatPath($folderPath, $fileName));
 		}
 		else {