Handle finding non-injectable option

pluginsGLPI · Mar 24, 2022 · c0311dd · c0311dd
1 parent 31f48de
commit c0311dd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/inc/commoninjectionlib.class.php b/inc/commoninjectionlib.class.php
@@ -505,8 +505,9 @@ private function manageFieldValues() {
                $searchOption = self::findSearchOption($searchOptions, $field);
                //searchoption relation type is already manage by manageRelations()
                //skip it
-               if ((isset($searchOption['displaytype']) && $searchOption['displaytype'] != 'relation')
-                  || !isset($searchOption['displaytype'])) {
+               if ($searchOption !== false &&
+                   ((isset($searchOption['displaytype']) && $searchOption['displaytype'] != 'relation')
+                  || !isset($searchOption['displaytype']))) {
                      $this->getFieldValue($injectionClass, $itemtype, $searchOption, $field, $value);
                }
             }
@@ -1512,7 +1513,7 @@ private function effectiveAddOrUpdate($injectionClass, $item, $values, $add = tr
 
       foreach ($values as $key => $value) {
          $option = self::findSearchOption($options, $key);
-         if (!isset($option['checktype']) || $option['checktype'] != self::FIELD_VIRTUAL) {
+         if ($option !== false && (!isset($option['checktype']) || $option['checktype'] != self::FIELD_VIRTUAL)) {
             //If field is a dropdown and value is '', then replace it by 0
             if (self::isFieldADropdown($option['displaytype']) && $value == self::EMPTY_VALUE) {
                $toinject[$key] = self::DROPDOWN_EMPTY_VALUE;