From 34667c88decf85170652f330859a7ced35c1cbc3 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Tue, 14 Sep 2021 17:07:36 -0500
Subject: [PATCH] SA-CORE-2021-010 by bradjones1, xjm, bbrala, gabesullice, Wim
Leers, e0ipso
---
core/modules/jsonapi/src/ResourceType/ResourceType.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/modules/jsonapi/src/ResourceType/ResourceType.php b/core/modules/jsonapi/src/ResourceType/ResourceType.php
index 1e2d65997310..27c1cbf1da1e 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()
: [];
}
--
GitLab