Sync: do not set null if overridden

refs #2623
Icinga · Oct 7, 2022 · 0231001 · 0231001
1 parent 20c3114
commit 0231001
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/library/Director/Import/Sync.php b/library/Director/Import/Sync.php
@@ -564,22 +564,25 @@ protected function prepareNewObject($row, DbObject $object, $objectKey, $sourceI
                         );
                     } else {
                         if ($val === null) {
-                            $this->setNull[$objectKey][] = $prop;
+                            $this->setNull[$objectKey][$prop] = $prop;
                         } else {
+                            unset($this->setNull[$objectKey][$prop]);
                             $object->vars()->$varName = $val;
                         }
                     }
                 } else {
                     if ($val === null) {
-                        $this->setNull[$objectKey][] = $prop;
+                        $this->setNull[$objectKey][$prop] = $prop;
                     } else {
+                        unset($this->setNull[$objectKey][$prop]);
                         $object->set($prop, $val);
                     }
                 }
             } else {
                 if ($val === null) {
-                    $this->setNull[$objectKey][] = $prop;
+                    $this->setNull[$objectKey][$prop] = $prop;
                 } else {
+                    unset($this->setNull[$objectKey][$prop]);
                     $object->set($prop, $val);
                 }
             }