Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / views / src / Plugin / views / filter / InOperator.php

diff --git a/web/core/modules/views/src/Plugin/views/filter/InOperator.php b/web/core/modules/views/src/Plugin/views/filter/InOperator.php
index cff42b9627916541289ab0f59e9f63f0873a7085..1e6682d69aa2cfd02940640d2e4499f0c8e1d285 100644 (file)
--- a/web/core/modules/views/src/Plugin/views/filter/InOperator.php
+++ b/web/core/modules/views/src/Plugin/views/filter/InOperator.php
@@ -229,7 +229,9 @@ class InOperator extends FilterPluginBase {
         '#default_value' => $default_value,
         // These are only valid for 'select' type, but do no harm to checkboxes.
         '#multiple' => TRUE,
-        '#size' => count($options) > 8 ? 8 : count($options),
+        // The value options can be a multidimensional array if the value form
+        // type is a select list, so make sure that they are counted correctly.
+        '#size' => min(count($options, COUNT_RECURSIVE), 8),
       ];
       $user_input = $form_state->getUserInput();
       if ($exposed && !isset($user_input[$identifier])) {