Sync: do not set null if overridden

refs #2623
This commit is contained in:
Thomas Gelf 2022-10-07 10:18:39 +02:00
parent 9a2c0162d2
commit afc7efe4d5
1 changed files with 6 additions and 3 deletions

View File

@ -564,22 +564,25 @@ class Sync
); );
} else { } else {
if ($val === null) { if ($val === null) {
$this->setNull[$objectKey][] = $prop; $this->setNull[$objectKey][$prop] = $prop;
} else { } else {
unset($this->setNull[$objectKey][$prop]);
$object->vars()->$varName = $val; $object->vars()->$varName = $val;
} }
} }
} else { } else {
if ($val === null) { if ($val === null) {
$this->setNull[$objectKey][] = $prop; $this->setNull[$objectKey][$prop] = $prop;
} else { } else {
unset($this->setNull[$objectKey][$prop]);
$object->set($prop, $val); $object->set($prop, $val);
} }
} }
} else { } else {
if ($val === null) { if ($val === null) {
$this->setNull[$objectKey][] = $prop; $this->setNull[$objectKey][$prop] = $prop;
} else { } else {
unset($this->setNull[$objectKey][$prop]);
$object->set($prop, $val); $object->set($prop, $val);
} }
} }