tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-22 13:24:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaObject: accept 'disable' on merge()

Browse Source 
fixes #1104
This commit is contained in:
Thomas Gelf 2017-08-24 16:35:09 +02:00
parent 94ac5054e4
commit f55a672d48
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/Director/Objects/IcingaObject.php
View File

@ -2444,7 +2444,16 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
$object->set('vars', []); $object->set('vars', []);
} }
$this->setProperties((array) $object->toPlainObject(null, true)); $plain = (array) $object->toPlainObject(null, false);
unset($plain['vars']);
foreach ($plain as $p => $v) {
if ($v === null) {
// We want default values, but no null values
continue;
}
$this->set($p, $v);
}
if ($object->supportsCustomVars()) { if ($object->supportsCustomVars()) {
$myVars = $this->vars(); $myVars = $this->vars();