Merge pull request #1346 from craftcms/bugfix/1340-entrified-fields

handle entrified categories and tags fields
craftcms · Jul 6, 2023 · b439f86 · b439f86
2 parents 3fdc8a7 + 5fb9d50
commit b439f86
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/fields/Matrix.php b/src/fields/Matrix.php
@@ -272,6 +272,10 @@ private function _parseSubField($feedData, $subFieldHandle, $subFieldInfo): mixe
 
         $subField = Hash::extract($this->field->getBlockTypeFields(), '{n}[handle=' . $subFieldHandle . ']')[0];
 
+        if (!$subField instanceof $subFieldClassHandle) {
+            $subFieldClassHandle = \craft\fields\Entries::class;
+        }
+
         $class = Plugin::$plugin->fields->getRegisteredField($subFieldClassHandle);
         $class->feedData = $feedData;
         $class->fieldHandle = $subFieldHandle;

diff --git a/src/fields/SuperTable.php b/src/fields/SuperTable.php
@@ -224,6 +224,10 @@ private function _parseSubField($feedData, $subFieldHandle, $subFieldInfo): mixe
 
         $subField = Hash::extract($this->field->getBlockTypeFields(), '{n}[handle=' . $subFieldHandle . ']')[0];
 
+        if (!$subField instanceof $subFieldClassHandle) {
+            $subFieldClassHandle = \craft\fields\Entries::class;
+        }
+
         $class = Plugin::$plugin->fields->getRegisteredField($subFieldClassHandle);
         $class->feedData = $feedData;
         $class->fieldHandle = $subFieldHandle;

diff --git a/src/services/Fields.php b/src/services/Fields.php
@@ -205,12 +205,21 @@ public function parseField($feed, $element, $feedData, $fieldHandle, $fieldInfo)
 
         $fieldClassHandle = Hash::get($fieldInfo, 'field');
 
+        // if category groups or tag groups have been entrified, the fields for them could have been entrified too;
+        // get the field by handle, check if the type hasn't changed since the feed was last saved;
+        // if it hasn't changed - proceed as before
+        // if it has changed - assume that we've entrified and adjust the $fieldClassHandle
+        $field = Craft::$app->getFields()->getFieldByHandle($fieldHandle);
+        if (!$field instanceof $fieldClassHandle) {
+            $fieldClassHandle = \craft\fields\Entries::class;
+        }
+
         // Find the class to deal with the attribute
         $class = $this->getRegisteredField($fieldClassHandle);
         $class->feedData = $feedData;
         $class->fieldHandle = $fieldHandle;
         $class->fieldInfo = $fieldInfo;
-        $class->field = Craft::$app->getFields()->getFieldByHandle($fieldHandle);
+        $class->field = $field;
         $class->element = $element;
         $class->feed = $feed;