From 78a4003acafed69150f10fd966ac46f19eabb65e Mon Sep 17 00:00:00 2001
From: Denny Lubitz <lubitz@vivomedia.de>
Date: Fri, 24 Feb 2023 16:33:47 +0100
Subject: [PATCH 1/2] Ensure properties are loaded properly

---
 Classes/Indexer/NodeIndexer.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Classes/Indexer/NodeIndexer.php b/Classes/Indexer/NodeIndexer.php
index 192e35a..e0a3956 100644
--- a/Classes/Indexer/NodeIndexer.php
+++ b/Classes/Indexer/NodeIndexer.php
@@ -135,8 +135,7 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null, $ind
 
         $fulltextData = [];
 
-        if (isset($this->indexedNodeData[$identifier])) {
-            $properties = $this->indexClient->findOneByIdentifier($identifier);
+        if (isset($this->indexedNodeData[$identifier]) ($properties = $this->indexClient->findOneByIdentifier($identifier)) !== false) {
             unset($properties['__identifier__']);
             $properties['__workspace'] .= ', #' . ($targetWorkspaceName ?? $node->getContext()->getWorkspaceName()) . '#';
             if (array_key_exists('__dimensionshash', $properties)) {

From 284a0d72e3821734cde08e162a8119797be16af2 Mon Sep 17 00:00:00 2001
From: Denny Lubitz <lubitz@vivomedia.de>
Date: Fri, 24 Feb 2023 16:46:08 +0100
Subject: [PATCH 2/2] Update NodeIndexer.php

---
 Classes/Indexer/NodeIndexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Indexer/NodeIndexer.php b/Classes/Indexer/NodeIndexer.php
index e0a3956..2578e77 100644
--- a/Classes/Indexer/NodeIndexer.php
+++ b/Classes/Indexer/NodeIndexer.php
@@ -135,7 +135,7 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null, $ind
 
         $fulltextData = [];
 
-        if (isset($this->indexedNodeData[$identifier]) ($properties = $this->indexClient->findOneByIdentifier($identifier)) !== false) {
+        if (isset($this->indexedNodeData[$identifier]) && ($properties = $this->indexClient->findOneByIdentifier($identifier)) !== false) {
             unset($properties['__identifier__']);
             $properties['__workspace'] .= ', #' . ($targetWorkspaceName ?? $node->getContext()->getWorkspaceName()) . '#';
             if (array_key_exists('__dimensionshash', $properties)) {