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

IcingaObject: support merge for objects with no CV

Browse Source
This commit is contained in:
Thomas Gelf 2016-03-11 13:56:34 +01:00
parent b6dc8e5faf
commit 8b903486d3
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1301,12 +1301,19 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
public function merge(IcingaObject $object) public function merge(IcingaObject $object)
{ {
$object = clone($object); $object = clone($object);
$vars = $object->getVars();
$object->vars = array(); if ($object->supportsCustomVars()) {
$vars = $object->getVars();
$object->vars = array();
}
$this->setProperties((array) $object->toPlainObject(null, true)); $this->setProperties((array) $object->toPlainObject(null, true));
$myVars = $this->vars();
foreach ($vars as $key => $var) { if ($object->supportsCustomVars()) {
$myVars->set($key, $var); $myVars = $this->vars();
foreach ($vars as $key => $var) {
$myVars->set($key, $var);
}
} }
return $this; return $this;