From afc7efe4d5eb28f8c9c788d6b1b2579a432b35f1 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 7 Oct 2022 10:18:39 +0200
Subject: [PATCH] Sync: do not set null if overridden

refs #2623
---
 library/Director/Import/Sync.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/Director/Import/Sync.php b/library/Director/Import/Sync.php
index adf8d1615..a6e902acb 100644
--- 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);
                 }
             }