Merge pull request #1675 from craftcms/bugfix/1674-getting-layout-by-id

don't freak out if there's no layout

Author: angrybrad

src/fields/Categories.php

@@ -241,7 +241,11 @@ public static function getMatchFields(FeedModel $feed, ?BaseRelationField $field
             if (!$categoryGroup) {
                 return FieldHelper::getAllUniqueIdFields();
             }
-            $fieldLayout = Craft::$app->getFields()->getLayoutById($categoryGroup->fieldLayoutId);
+
+            $fieldLayout = null;
+            if ($categoryGroup->fieldLayoutId) {
+                $fieldLayout = Craft::$app->getFields()->getLayoutById($categoryGroup->fieldLayoutId);
+            }
             if (!$fieldLayout) {
                 return FieldHelper::getAllUniqueIdFields();
             }

src/fields/Entries.php

@@ -268,7 +268,11 @@ public static function getMatchFields(FeedModel $feed, ?BaseRelationField $field
                 return FieldHelper::getAllUniqueIdFields();
             }
 
-            $fieldLayout = Craft::$app->getFields()->getLayoutById($entryType->fieldLayoutId);
+            $fieldLayout = null;
+            if ($entryType->fieldLayoutId) {
+                $fieldLayout = Craft::$app->getFields()->getLayoutById($entryType->fieldLayoutId);
+            }
+
             if (!$fieldLayout) {
                 return FieldHelper::getAllUniqueIdFields();
             }
@@ -294,8 +298,12 @@ public static function getMatchFields(FeedModel $feed, ?BaseRelationField $field
             $entryTypes = Collection::make($entryTypes)->keyBy('id');
 
             foreach ($entryTypes as $entryType) {
-                $fieldLayout = Craft::$app->getFields()->getLayoutById($entryType->fieldLayoutId);
-                $allowedFields = [...$allowedFields, ...$fieldLayout->getCustomFields()];
+                if ($entryType->fieldLayoutId) {
+                    $fieldLayout = Craft::$app->getFields()->getLayoutById($entryType->fieldLayoutId);
+                    if ($fieldLayout) {
+                        $allowedFields = [...$allowedFields, ...$fieldLayout->getCustomFields()];
+                    }
+                }
             }
 
             // if there's a custom source in the mix, we should add all the fields too