fix(checkboxesfield,multiselectfield): php warning

pluginsGLPI · Apr 17, 2023 · 342c39e · 342c39e
1 parent 69731d1
commit 342c39e
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/inc/field/checkboxesfield.class.php b/inc/field/checkboxesfield.class.php
@@ -52,20 +52,23 @@ public function showForm(array $options): void {
 
       $value = [];
       $items = json_decode($this->question->fields['default_values']);
-      foreach ($items as $item) {
-         if (trim($item) === '') {
-            continue;
-         }
-         if (!in_array($item, $this->getAvailableValues())) {
-            continue;
+      if ($items !== null) {
+         // when we edit an existing question
+         foreach ($items as $item) {
+            if (trim($item) === '') {
+               continue;
+            }
+            if (!in_array($item, $this->getAvailableValues())) {
+               continue;
+            }
+            $value[] = $item;
          }
-         $value[] = $item;
+         $this->question->fields['default_values'] = implode("\r\n", $value);
+         $this->deserializeValue($this->question->fields['default_values']);
       }
-      $this->question->fields['default_values'] = implode("\r\n", $value);
       $this->question->fields['values'] =  json_decode($this->question->fields['values']);
       $this->question->fields['values'] = is_array($this->question->fields['values']) ? $this->question->fields['values'] : [];
       $this->question->fields['values'] = implode("\r\n", $this->question->fields['values']);
-      $this->deserializeValue($this->question->fields['default_values']);
 
       $parameters = $this->getParameters();
       TemplateRenderer::getInstance()->display($template, [