[icinga-checkins] icinga.org: icingaweb2-module-director/feature/icinga-legacy-config-13049: IcingaTemplateResolver: ignore multicolumn key...

git at icinga.org git at icinga.org
Fri Nov 11 10:43:59 CET 2016


Module: icingaweb2-module-director
Branch: feature/icinga-legacy-config-13049
Commit: 5bae79290135fbc176608939a9c07fd42c27f28a
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=5bae79290135fbc176608939a9c07fd42c27f28a

Author: Thomas Gelf <thomas at gelf.net>
Date:   Tue Nov  8 16:27:44 2016 +0100

IcingaTemplateResolver: ignore multicolumn key...

...objects on refresh (for now)

fixes #13081

---

 library/Director/Objects/IcingaTemplateResolver.php |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/Director/Objects/IcingaTemplateResolver.php b/library/Director/Objects/IcingaTemplateResolver.php
index 31a913e..10d3aca 100644
--- a/library/Director/Objects/IcingaTemplateResolver.php
+++ b/library/Director/Objects/IcingaTemplateResolver.php
@@ -379,7 +379,10 @@ class IcingaTemplateResolver
         $parentNames = $object->imports;
         self::$nameIdx[$object->object_name] = $parentNames;
         if ($object->hasBeenLoadedFromDb()) {
-            self::$idIdx[$object->getId()] = $this->getIdsForNames($parentNames);
+            $id = $object->getId();
+            if (! is_array($id)) {
+                self::$idIdx[$id] = $this->getIdsForNames($parentNames);
+            }
         }
         return $this;
     }



More information about the icinga-checkins mailing list