[icinga-checkins] icinga.org: icinga-web/elippmann/default: Use array_merge_recursive on extending xml templates

git at icinga.org git at icinga.org
Fri Nov 25 01:24:11 CET 2011


Module: icinga-web
Branch: elippmann/default
Commit: 6eb13784bffc2cfc5e19931b75be813396949a41
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=6eb13784bffc2cfc5e19931b75be813396949a41

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Fri Nov 25 01:17:33 2011 +0100

Use array_merge_recursive on extending xml templates

This change allows deeper extensions to templates,
i.e. listening to grid events which is required
by inGraph.

---

 .../template/CronkGridTemplateXmlParser.class.php  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app/modules/Cronks/lib/template/CronkGridTemplateXmlParser.class.php b/app/modules/Cronks/lib/template/CronkGridTemplateXmlParser.class.php
index ae39ac9..85d4f7e 100644
--- a/app/modules/Cronks/lib/template/CronkGridTemplateXmlParser.class.php
+++ b/app/modules/Cronks/lib/template/CronkGridTemplateXmlParser.class.php
@@ -221,7 +221,7 @@ class CronkGridTemplateXmlParser {
     }
 
     private function applyExtender(array $extender) {
-        $this->data = array_merge($this->data,$extender["data"]);
+        $this->data = array_merge_recursive($this->data,$extender["data"]);
         foreach($extender["fields"] as $fieldname=>$field) {
             
             if(!isset($field['preferPosition'])) {





More information about the icinga-checkins mailing list