From 0fb92e87f11e7b4ec815cb77a322a6f514f98c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Randy=20=C4=8Cupi=C4=87?= <randy@netgen.io>
Date: Wed, 2 Oct 2024 12:48:52 +0200
Subject: [PATCH] Fix critical issue with search fields

---
 lib/FieldType/SearchFields.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/FieldType/SearchFields.php b/lib/FieldType/SearchFields.php
index aa5916d..c0b8b41 100644
--- a/lib/FieldType/SearchFields.php
+++ b/lib/FieldType/SearchFields.php
@@ -32,6 +32,10 @@ public function __construct(
      */
     public function getIndexData(Field $field, FieldDefinition $fieldDefinition): array
     {
+        if ($this->isEmpty($field)) {
+            return [];
+        }
+
         $remoteResourceLocationId = $field->value->externalData['remote_resource_location_id'];
         $remoteId = $field->value->externalData['remote_id'];
         $watermarkText = $field->value->externalData['watermark_text'];
@@ -156,6 +160,11 @@ public function getDefaultSortField(): ?string
         return $this->getDefaultMatchField();
     }
 
+    private function isEmpty(Field $field): bool
+    {
+        return $field->value->externalData === null;
+    }
+
     private function prepareStringValue(?string $value): ?string
     {
         return $value !== null ? trim(mb_substr($value, 0, 255)) : null;