From 9c2a12536595ab2c36b25808df19f30497714640 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Tue, 17 Sep 2019 17:04:36 +0300
Subject: [PATCH] Field Manager fix

---
 application/Espo/Core/Utils/FieldManager.php | 47 ++++++++------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/application/Espo/Core/Utils/FieldManager.php b/application/Espo/Core/Utils/FieldManager.php
index 5fd9bf3553..c952378373 100644
--- a/application/Espo/Core/Utils/FieldManager.php
+++ b/application/Espo/Core/Utils/FieldManager.php
@@ -271,7 +271,7 @@ class FieldManager
 
         $entityDefs = $this->normalizeDefs($scope, $name, $fieldDefs);
 
-        if (!empty($entityDefs)) {
+        if (!empty((array) $entityDefs)) {
             $result &= $this->saveCustomEntityDefs($scope, $entityDefs);
             $this->isChanged = true;
         }
@@ -430,13 +430,15 @@ class FieldManager
         return $this->getMetadata()->get('entityDefs'.'.'.$scope.'.fields.'.$name, $default);
     }
 
-    protected function getCustomFieldDefs($scope, $name)
+    protected function getCustomFieldDefs($scope, $name, $default = null)
     {
         $customDefs = $this->getMetadata()->getCustom('entityDefs', $scope, (object) []);
 
         if (isset($customDefs->fields->$name)) {
             return (array) $customDefs->fields->$name;
         }
+
+        return $default;
     }
 
     protected function saveCustomEntityDefs($scope, $newDefs)
@@ -529,43 +531,32 @@ class FieldManager
             }
         }
 
-        $actualCustomFieldDefs = $this->getCustomFieldDefs($scope, $name);
+        $actualCustomFieldDefs = $this->getCustomFieldDefs($scope, $name, []);
         $actualFieldDefs = $this->getFieldDefs($scope, $name, []);
         $permittedParamList = array_keys($params);
 
-        $filteredFieldDefs = $actualCustomFieldDefs ? $actualCustomFieldDefs : [];
+        $filteredFieldDefs = !empty($actualCustomFieldDefs) ? $actualCustomFieldDefs : [];
 
         foreach ($fieldDefs as $paramName => $paramValue) {
             if (in_array($paramName, $permittedParamList)) {
+
+                $defaultParamValue = null;
+
                 switch ($params[$paramName]['type']) {
                     case 'bool':
-                        $fieldDefsDefaultValue = array_key_exists('default', $params[$paramName]) ? $params[$paramName]['default'] : false;
-
-                        $actualValue = array_key_exists($paramName, $actualFieldDefs) ? $actualFieldDefs[$paramName] : $fieldDefsDefaultValue;
-
-                        if (!Util::areValuesEqual($actualValue, $paramValue)) {
-                            $filteredFieldDefs[$paramName] = $paramValue;
-                        }
+                        $defaultParamValue = false;
                         break;
+                }
 
-                    default:
-                        if (!array_key_exists('default', $params[$paramName]) && !array_key_exists($paramName, $actualFieldDefs)) {
-                            $filteredFieldDefs[$paramName] = $paramValue;
-                            break;
-                        }
+                $actualValue = array_key_exists($paramName, $actualFieldDefs) ? $actualFieldDefs[$paramName] : $defaultParamValue;
 
-                        if (array_key_exists('default', $params[$paramName])) {
-                            $actualValue = $params[$paramName]['default'];
-                        }
+                if (!array_key_exists($paramName, $actualCustomFieldDefs) && !Util::areValuesEqual($actualValue, $paramValue)) {
+                    $filteredFieldDefs[$paramName] = $paramValue;
+                    continue;
+                }
 
-                        if (array_key_exists($paramName, $actualFieldDefs)) {
-                            $actualValue = $actualFieldDefs[$paramName];
-                        }
-
-                        if (!Util::areValuesEqual($actualValue, $paramValue)) {
-                            $filteredFieldDefs[$paramName] = $paramValue;
-                        }
-                        break;
+                if (array_key_exists($paramName, $actualCustomFieldDefs)) {
+                    $filteredFieldDefs[$paramName] = $paramValue;
                 }
             }
         }
@@ -593,7 +584,7 @@ class FieldManager
      * @param string $scope
      * @param string $fieldName
      * @param array $fieldDefs
-     * @return array
+     * @return object
      */
     protected function normalizeDefs($scope, $fieldName, array $fieldDefs)
     {