From f2f4c098eeabe88bd08f2c4fe1a57c05c9938eda Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Fri, 11 Aug 2023 10:37:38 +0100
Subject: [PATCH] MDL-78980 admin: ensure all values for multiselect presets
 are used.

Previously, just the first value was selected. Instead defer to the
implementation in the base class for `set_value`.
---
 ...resets_admin_setting_configmultiselect.php | 32 ++-----------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php
index 7ae72675a32..025de6b1a11 100644
--- a/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php
+++ b/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php
@@ -26,42 +26,14 @@ namespace core_adminpresets\local\setting;
  */
 class adminpresets_admin_setting_configmultiselect extends adminpresets_setting {
 
-    /**
-     * Ensure that the $value values are setting choices.
-     *
-     * @param mixed $value Setting value
-     * @return mixed Returns false if wrong param value
-     */
-    protected function set_value($value) {
-        if ($value) {
-            $options = explode(',', $value);
-            foreach ($options as $option) {
-
-                foreach ($this->settingdata->choices as $key => $choice) {
-
-                    if ($key == $option) {
-                        $this->value = $option;
-                        $this->set_visiblevalue();
-                        return true;
-                    }
-                }
-            }
-
-            $value = implode(',', $options);
-        }
-        $this->value = $value;
-        $this->set_visiblevalue();
-
-        return true;
-    }
-
     protected function set_visiblevalue() {
         $values = explode(',', $this->value);
         $visiblevalues = [];
 
         foreach ($values as $value) {
 
-            if (!empty($this->settingdata->choices[$value])) {
+            // Ensure that each value exists as a setting choice.
+            if (array_key_exists($value, $this->settingdata->choices)) {
                 $visiblevalues[] = $this->settingdata->choices[$value];
             }
         }