Pull merge.

[yaffs-website] / web / core / modules / views / src / Form / ViewsExposedForm.php

diff --git a/web/core/modules/views/src/Form/ViewsExposedForm.php b/web/core/modules/views/src/Form/ViewsExposedForm.php
index 44e7ec4b0f3b7fddd7d2b515504fdace23e58617..173dd776fc2e303f29a62fc88d900b13d1b6b277 100644 (file)
--- a/web/core/modules/views/src/Form/ViewsExposedForm.php
+++ b/web/core/modules/views/src/Form/ViewsExposedForm.php
@@ -12,6 +12,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides the views exposed form.
+ *
+ * @internal
  */
 class ViewsExposedForm extends FormBase {
 
@@ -101,7 +103,7 @@ class ViewsExposedForm extends FormBase {
     }
 
     $form['actions'] = [
-      '#type' => 'actions'
+      '#type' => 'actions',
     ];
     $form['actions']['submit'] = [
       // Prevent from showing up in \Drupal::request()->query.
@@ -181,7 +183,7 @@ class ViewsExposedForm extends FormBase {
           //   https://www.drupal.org/node/342316 is resolved.
           $checked = Checkboxes::getCheckedCheckboxes($value);
           foreach ($checked as $option_id) {
-            $view->exposed_raw_input[$option_id] = $value[$option_id];
+            $view->exposed_raw_input[$key][] = $value[$option_id];
           }
         }
         else {