[icinga-checkins] icinga.org: icingaweb2-module-director/master: IcingaObject: fix host merge test

git at icinga.org git at icinga.org
Thu Feb 25 19:39:08 CET 2016


Module: icingaweb2-module-director
Branch: master
Commit: a3a17df43772a7780c836112ed0ab00db34b36f7
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=a3a17df43772a7780c836112ed0ab00db34b36f7

Author: Thomas Gelf <thomas at gelf.net>
Date:   Thu Feb 25 19:38:52 2016 +0100

IcingaObject: fix host merge test

---

 library/Director/Objects/IcingaObject.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Director/Objects/IcingaObject.php b/library/Director/Objects/IcingaObject.php
index 49585e2..8e3fa1c 100644
--- a/library/Director/Objects/IcingaObject.php
+++ b/library/Director/Objects/IcingaObject.php
@@ -1120,7 +1120,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
         $object = clone($object);
         $vars = $object->getVars();
         $object->vars = array();
-        $this->setProperties((array) $object->toPlainObject());
+        $this->setProperties((array) $object->toPlainObject(null, true));
         $myVars = $this->vars();
         foreach ($vars as $key => $var) {
             $myVars->set($key, $var);



More information about the icinga-checkins mailing list