Security update for Core, with self-updated composer

[yaffs-website] / web / core / lib / Drupal / Core / Entity / Element / EntityAutocomplete.php

diff --git a/web/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php b/web/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
index 89f99a049f5403dd4496ca04a985c700f4fd19d6..e82ed81cc2b5c283d9f360da1f1ec12d250c8ff7 100644 (file)
--- a/web/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
+++ b/web/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
@@ -77,7 +77,7 @@ class EntityAutocomplete extends Textfield {
     // Potentially the #value is set directly, so it contains the 'target_id'
     // array structure instead of a string.
     if ($input !== FALSE && is_array($input)) {
-      $entity_ids = array_map(function(array $item) {
+      $entity_ids = array_map(function (array $item) {
         return $item['target_id'];
       }, $input);
 
@@ -152,10 +152,9 @@ class EntityAutocomplete extends Textfield {
     $value = NULL;
 
     if (!empty($element['#value'])) {
-      $options = [
+      $options = $element['#selection_settings'] + [
         'target_type' => $element['#target_type'],
         'handler' => $element['#selection_handler'],
-        'handler_settings' => $element['#selection_settings'],
       ];
       /** @var /Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface $handler */
       $handler = \Drupal::service('plugin.manager.entity_reference_selection')->getInstance($options);