FieldManager fixes

2015-04-28 14:40:50 +03:00
parent 1135573af6
commit 59a564cc1b
1 changed files with 5 additions and 5 deletions
@@ -187,11 +187,6 @@ class FieldManager
            }
        }

-        if (isset($fieldDef['linkDefs'])) {
-            $linkDefs = $fieldDef['linkDefs'];
-            unset($fieldDef['linkDefs']);
-        }
-
        $currentOptionList = array_keys((array) $this->getFieldDef($name, $scope));
        foreach ($fieldDef as $defName => $defValue) {
            if ( (!isset($defValue) || $defValue === '') && !in_array($defName, $currentOptionList) ) {
@@ -219,6 +214,11 @@ class FieldManager
            $fieldDef = Util::merge($metaFieldDef, $fieldDef);
        }

+        if (isset($fieldDef['linkDefs'])) {
+            $linkDefs = $fieldDef['linkDefs'];
+            unset($fieldDef['linkDefs']);
+        }
+
        $defs = array(
            'fields' => array(
                $fieldName => $fieldDef,