fix(dropdownfield): upgraded fields from 2.5 may crash

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Apr 19, 2019 · 8233b75 · 8233b75
1 parent 1cec1e0
commit 8233b75
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -230,7 +230,11 @@ public static function getName() {
    public function isValid() {
       // If the field is required it can't be empty
       $itemtype = json_decode($this->fields['values'], true);
-      $itemtype = $itemtype['itemtype'];
+      if ($itemtype === null) {
+         $itemtype = $this->fields['values'];
+      } else {
+         $itemtype = $itemtype['itemtype'];
+      }
       $dropdown = new $itemtype();
       if ($this->isRequired() && $dropdown->isNewId($this->value)) {
          Session::addMessageAfterRedirect(