Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

2013-11-28 14:30:24 +02:00
parent b3d94dde9d 135c4ca5e0
commit 958596ee9c
1 changed files with 1 additions and 1 deletions
@@ -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 {