diff --git a/core/modules/jsonapi/src/ResourceType/ResourceType.php b/core/modules/jsonapi/src/ResourceType/ResourceType.php index 1e2d659973103afcc7e22cc690e7d0632c809079..27c1cbf1da1e432129e8891fd134ee250aeebc16 100644 --- a/core/modules/jsonapi/src/ResourceType/ResourceType.php +++ b/core/modules/jsonapi/src/ResourceType/ResourceType.php @@ -405,7 +405,7 @@ public function getRelatableResourceTypes() { $this->relatableResourceTypesByField = array_reduce(array_map(function (ResourceTypeRelationship $field) { return [$field->getPublicName() => $field->getRelatableResourceTypes()]; }, array_filter($this->fields, function (ResourceTypeField $field) { - return $field instanceof ResourceTypeRelationship; + return $field instanceof ResourceTypeRelationship && $field->isFieldEnabled(); })), 'array_merge', []); } return $this->relatableResourceTypesByField; @@ -423,7 +423,7 @@ public function getRelatableResourceTypes() { * @see self::getRelatableResourceTypes() */ public function getRelatableResourceTypesByField($field_name) { - return ($field = $this->getFieldByPublicName($field_name)) && $field instanceof ResourceTypeRelationship + return ($field = $this->getFieldByPublicName($field_name)) && $field instanceof ResourceTypeRelationship && $field->isFieldEnabled() ? $field->getRelatableResourceTypes() : []; }