Fix missing option in new multiselect field

field/field_class.php

@@ -949,15 +949,6 @@ public function set_field($forminput = null) {
             }
         }
 
-        // NOTE: We don't use this code ever, test till 30.04.2021 and remove after.
-        if ($this->field->type != "multiselect") {
-            $dummyentry = "0";
-            while (array_search($dummyentry, $newvalues) !== false) {
-                $dummyentry .= "0";
-            }
-            $newvalues = array_merge(array(0 => $dummyentry), $newvalues);
-        }
-
         $map = array(0 => 0);
         for ($i = 1; $i <= count($oldvalues); $i++) {
             $j = array_search($oldvalues[$i], $newvalues);
@@ -985,7 +976,6 @@ public function set_field($forminput = null) {
             $this->update_options($map);
         }
 
-        unset($newvalues[0]);
         $this->field->param1 = implode("\n", $newvalues);
         for ($i = 2; $i <= 10; $i++) {
             $param = "param$i";

filter/filter_class.php

@@ -610,7 +610,7 @@ public function get_filter_from_id($filterid = 0, array $options = null) {
             $view = !empty($options['view']) ? $options['view'] : null;
             $viewid = $view ? $view->id() : 0;
             $advanced = !empty($options['advanced']);
-            $customfilter = $options['customfilter'];
+            $customfilter = !empty($options['customfilter']) ? $options['customfilter'] : null;
 
             // User preferences.
             if (($filterid == self::USER_FILTER_SET || $advanced || $customfilter) && $view && $view->is_active()) {

tests/behat/customfilter_multiselect.feature

@@ -108,7 +108,6 @@ Feature: Create entry, add multiselect and use customfilter
     And I should not see "Opt5"
 
     # Use customfilter to select Opt1 OR Opt2.
-    When I follow "Search"
     And I open the autocomplete suggestions list
     And I click on "Opt1" item in the autocomplete list
     And I close the autocomplete suggestions list