Security update for Core, with self-updated composer

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

diff --git a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
index 55372f9e7185044d3e7469e17c1f5b9ae250bf40..2cede4dffaa5717820a35b56c5142108c2f0666d 100644 (file)
--- a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
@@ -52,10 +52,9 @@ class EntityAutocompleteMatcher {
   public function getMatches($target_type, $selection_handler, $selection_settings, $string = '') {
     $matches = [];
 
-    $options = [
+    $options = $selection_settings + [
       'target_type' => $target_type,
       'handler' => $selection_handler,
-      'handler_settings' => $selection_settings,
     ];
     $handler = $this->selectionManager->getInstance($options);