[icinga-checkins] icinga.org: icinga-web/mhein/default: * Fixed AppkitResourceConfigHandler possibly including same file multiple times

git at icinga.org git at icinga.org
Fri Aug 26 16:28:46 CEST 2011


Module: icinga-web
Branch: mhein/default
Commit: 716876c8cf6784bf02b2806ae84e01402dc886b0
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=716876c8cf6784bf02b2806ae84e01402dc886b0

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Fri Aug 26 12:26:17 2011 +0200

* Fixed AppkitResourceConfigHandler possibly including same file multiple times

---

 .../config/AppKitResourceConfigHandler.class.php   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php b/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php
index c189a12..4ef81d4 100644
--- a/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php
+++ b/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php
@@ -75,10 +75,10 @@ class AppKitResourceConfigHandler extends AgaviXmlConfigHandler {
 
             // Collecting resources
             foreach($this->_resources as $resource => $sfx) {
-                $resources[$resource] = array_merge(
+                $resources[$resource] = array_unique(array_merge(
                                             $resources[$resource],
                                             $this->collectResource($resource, $sfx, $cfg)
-                                        );
+                                        ));
             }
             // Collecting javascript actions
             foreach($cfg->getChildren('jactions', null, true) as $jaction) {





More information about the icinga-checkins mailing list