fix rebase; move vars in if block

pluginsGLPI · Jun 10, 2022 · fd0594b · fd0594b
1 parent 56b2e5f
commit fd0594b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/inc/field.class.php b/inc/field.class.php
@@ -783,8 +783,11 @@ public static function prepareHtmlFields(
 
         // Fill status overrides if needed
         $item = new $itemtype();
-        $new_item = !$item->getFromDB($items_id);
-        if (in_array($itemtype, PluginFieldsStatusOverride::getStatusItemtypes()) && $new_item) {
+        if (!empty($items_id)) {
+            $item->getFromDB($items_id);
+        }
+
+        if (!$item->isNewItem() && in_array($itemtype, PluginFieldsStatusOverride::getStatusItemtypes())) {
             $status_overrides = PluginFieldsStatusOverride::getOverridesForItem($container_obj->getID(), $item);
             foreach ($status_overrides as $status_override) {
                 if (isset($fields[$status_override['plugin_fields_fields_id']])) {
@@ -794,20 +797,18 @@ public static function prepareHtmlFields(
             }
         }
 
-        $classname = PluginFieldsContainer::getClassname($itemtype, $container_obj->fields['name']);
-        $obj = new $classname();
-
-        if (!$new_item) {
+        $found_v = null;
+        if (!$item->isNewItem()) {
             //find row for this object with the items_id
+            $classname = PluginFieldsContainer::getClassname($itemtype, $container_obj->fields['name']);
+            $obj = new $classname();
             $found_values = $obj->find(
                 [
                     'plugin_fields_containers_id' => $first_field['plugin_fields_containers_id'],
                     'items_id' => $items_id,
                 ]
             );
             $found_v = array_shift($found_values);
-        } else {
-            $found_v = null;
         }
 
         // find profiles (to check if current profile can edit fields)