From 9e41f70c8b79c7b34e683b9cbc44dbfcb7757229 Mon Sep 17 00:00:00 2001
From: Peter Philipp <9515-daspeter@users.noreply.drupalcode.org>
Date: Fri, 21 Mar 2025 09:49:41 +0000
Subject: [PATCH] Issue #3514604: Fix for translation merging

---
 src/ExternalEntityStorage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ExternalEntityStorage.php b/src/ExternalEntityStorage.php
index 03b06c1..f1a5f45 100644
--- a/src/ExternalEntityStorage.php
+++ b/src/ExternalEntityStorage.php
@@ -725,7 +725,7 @@ class ExternalEntityStorage extends ContentEntityStorageBase implements External
 
       // Check if there are translation data available.
       foreach ($all_raw_data[$id] as $key => $raw_translation_data) {
-        if (str_starts_with($key, self::EXTERNAL_ENTITY_TRANSLATION_SUB_FIELD_PREFIX)) {
+        if (isset($raw_translation_data[$id]) && str_starts_with($key, self::EXTERNAL_ENTITY_TRANSLATION_SUB_FIELD_PREFIX)) {
           try {
             $langcode = str_replace(self::EXTERNAL_ENTITY_TRANSLATION_SUB_FIELD_PREFIX, '', $key);
             $entity_translation_data = $this->extractEntityValuesFromRawData($raw_translation_data[$id]);
-- 
GitLab