Bypasses condition evaluation if retrieved identifier doesn't exist

discoverygarden · Jun 26, 2024 · 78c3f76 · 78c3f76
1 parent 5c4250d
commit 78c3f76
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Plugin/Condition/EntityHasIdentifier.php b/src/Plugin/Condition/EntityHasIdentifier.php
@@ -110,11 +110,13 @@ public function evaluate(): bool {
     $entity = $this->getContextValue('entity');
     if ($entity instanceof FieldableEntityInterface) {
       $identifier = $this->entityTypeManager->getStorage('dgiactions_identifier')->load($this->configuration['identifier']);
-      $field = $identifier->get('field');
-      $entity_type = $identifier->get('entity');
-      $bundle = $identifier->get('bundle');
-      if (!empty($field) && $entity->hasField($field) && $entity->getEntityTypeId() == $entity_type && $entity->bundle() == $bundle) {
-        return !$entity->get($field)->isEmpty();
+      if ($identifier) {
+        $field = $identifier->get('field');
+        $entity_type = $identifier->get('entity');
+        $bundle = $identifier->get('bundle');
+        if (!empty($field) && $entity->hasField($field) && $entity->getEntityTypeId() == $entity_type && $entity->bundle() == $bundle) {
+          return !$entity->get($field)->isEmpty();
+        }
       }
     }
     return FALSE;