Fixed #14838

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Fixed a bug where entry GraphQL queries weren’t available if only nested entry field queries were selected in the schema.
 - Fixed a bug where chip labels could wrap unnecessarily. ([#15000](https://github.com/craftcms/cms/issues/15000), [#15017](https://github.com/craftcms/cms/pull/15017))
 - Fixed a bug where date/time clear buttons could bleed out of their container. ([#15017](https://github.com/craftcms/cms/pull/15017))
+- Fixed an error that occurred when editing an element, if any field layout conditions referenced a custom field that was no longer included in the layout. ([#14838](https://github.com/craftcms/cms/issues/14838))
 
 ## 5.1.4 - 2024-05-17
 

src/fields/conditions/FieldConditionRuleTrait.php

@@ -224,9 +224,16 @@ public function modifyQuery(QueryInterface $query): void
      */
     public function matchElement(ElementInterface $element): bool
     {
+        try {
+            $fieldInstances = $this->fieldInstances();
+        } catch (InvalidConfigException) {
+            // The field doesn't exist
+            return true;
+        }
+
         // index the field instance UUIDs
         $instanceUids = array_flip(
-            array_map(fn(FieldInterface $field) => $field->layoutElement->uid, $this->fieldInstances()),
+            array_map(fn(FieldInterface $field) => $field->layoutElement->uid, $fieldInstances),
         );
 
         foreach ($element->getFieldLayout()->getCustomFields() as $field) {