Module: nagvis Branch: master Commit: d9b3ddf3210dc6eb973195290f83716be121a6d4 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=d9b3ddf3210dc6eb973195290f83716be121a6d4
Author: LaMi <[email protected]> Date: Sat Apr 10 00:50:54 2010 +0200 Some small improvements --- share/server/core/classes/objects/NagVisMapObj.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/share/server/core/classes/objects/NagVisMapObj.php b/share/server/core/classes/objects/NagVisMapObj.php index b803cbc..234b7e5 100644 --- a/share/server/core/classes/objects/NagVisMapObj.php +++ b/share/server/core/classes/objects/NagVisMapObj.php @@ -375,7 +375,8 @@ class NagVisMapObj extends NagVisStatefulObject { private function fetchMapObjects() { foreach($this->MAPCFG->getValidObjectTypes() AS $type) { if($type != 'global' && $type != 'template' && is_array($objs = $this->MAPCFG->getDefinitions($type))){ - $typeKeys = $this->MAPCFG->getValidTypeKeys($type); + $typeDefs = $this->MAPCFG->getTypeDefaults($type); + $typeKeys = array_keys($typeDefs); foreach($objs AS $index => $objConf) { // workaround $objConf['id'] = $index; @@ -383,7 +384,7 @@ class NagVisMapObj extends NagVisStatefulObject { // merge with "global" settings foreach($typeKeys AS $key) { if(!isset($objConf[$key])) { - $objConf[$key] = $this->MAPCFG->getValue($type, $index, $key); + $objConf[$key] = $typeDefs[$key]; } } ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
