Module: nagvis
Branch: master
Commit: 2c67b464c6ca78a8da58fb9919d4a875a9e41a62
URL:    
http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=2c67b464c6ca78a8da58fb9919d4a875a9e41a62

Author: Lars Michelsen <[email protected]>
Date:   Sun Aug  2 22:38:21 2009 +0200

Fixed merge related problem

---

 share/nagvis/includes/classes/GlobalIndexPage.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/share/nagvis/includes/classes/GlobalIndexPage.php 
b/share/nagvis/includes/classes/GlobalIndexPage.php
index dae480b..a3e347a 100755
--- a/share/nagvis/includes/classes/GlobalIndexPage.php
+++ b/share/nagvis/includes/classes/GlobalIndexPage.php
@@ -198,7 +198,7 @@ class GlobalIndexPage {
        public function parseMapsJson() {
                $aMaps = Array();
                
-               foreach($this->CORE->getAvailableMaps() AS $mapName) {
+               foreach($this->CORE->getAvailableMaps() AS $object_id => 
$mapName) {
                        $MAPCFG = new NagVisMapCfg($this->CORE, $mapName);
                        if(!$MAPCFG->readMapConfig()) {
                                // Skip this map when config problem


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to