Merge pull request #926 from UN-OCHA/berliner/HPC-9404

HPC-9404: Fix context handling when fetching attachments for entities

html/modules/custom/ghi_form_elements/src/Element/EntityAttachmentSelect.php

@@ -111,7 +111,7 @@ public static function processEntityAttachmentSelect(array &$element, FormStateI
     $context = $element['#element_context'];
     $plan_id = $context['plan_object']->get('field_original_id')->value;
     $plan_entities = self::getPlanEntitiesQuery($plan_id)->getPlanEntities($context['base_object']);
-    $valid_entity_ids = [$plan_id] + array_keys($plan_entities);
+    $valid_entity_ids = array_merge([$plan_id], array_keys($plan_entities));
     $defaults['entities']['entity_ids'] = array_filter($defaults['entities']['entity_ids'] ?? [], function ($_entity_id) use ($valid_entity_ids) {
       return in_array($_entity_id, $valid_entity_ids);
     });