[icinga-checkins] icinga.org: icinga-web/r1.5: Fix too greedy regex on collecting resource files

git at icinga.org git at icinga.org
Mon Nov 28 12:47:15 CET 2011


Module: icinga-web
Branch: r1.5
Commit: ed16000e8a5e8f68bfbc69ea2aaf88ac23293073
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=ed16000e8a5e8f68bfbc69ea2aaf88ac23293073

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

Fix too greedy regex on collecting resource files

---

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

diff --git a/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php b/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php
index 4ef81d4..ca7c11b 100644
--- a/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php
+++ b/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php
@@ -44,7 +44,7 @@ class AppKitResourceConfigHandler extends AgaviXmlConfigHandler {
                                       array_keys(iterator_to_array(
                                                      AppKitIteratorUtil::RegexRecursiveDirectoryIterator(
                                                          $r,
-                                                         sprintf('/\%s/i', $sfx)
+                                                         sprintf('/^[^.].+\%s$/i', $sfx)
                                                      )
                                                  ))
                                   );





More information about the icinga-checkins mailing list