Fix MultiSelect when empty selection is given

humhub · Dec 20, 2023 · c1624b5 · c1624b5
1 parent e1069ca
commit c1624b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/protected/humhub/modules/ui/form/widgets/BasePicker.php b/protected/humhub/modules/ui/form/widgets/BasePicker.php
@@ -238,7 +238,7 @@ public function beforeRun()
      */
     public function run()
     {
-        if ($this->selection != null && !is_array($this->selection)) {
+        if ($this->selection !== null && !is_array($this->selection)) {
             $this->selection = [$this->selection];
         }
 

diff --git a/protected/humhub/modules/ui/form/widgets/MultiSelect.php b/protected/humhub/modules/ui/form/widgets/MultiSelect.php
@@ -8,6 +8,8 @@
 
 namespace humhub\modules\ui\form\widgets;
 
+use yii\helpers\ArrayHelper;
+
 /**
  * Multiselect
  *
@@ -51,7 +53,7 @@ protected function getItemKey($item)
 
     protected function getSelectedOptions()
     {
-        if (empty($this->selection)) {
+        if ($this->selection === null) {
             $attribute = $this->attribute;
             $this->selection = ($this->model) ? $this->model->$attribute : [];
         }
@@ -66,7 +68,7 @@ protected function getSelectedOptions()
                 continue;
             }
 
-            $result[$key] = $this->buildItemOption([$key => $value], in_array($key, $this->selection));
+            $result[$key] = $this->buildItemOption([$key => $value], ArrayHelper::keyExists($key, $this->selection));
         }
         return $result;
     }