Module: nagvis Branch: master Commit: 69cfa3f0156d04c6605ba3cefb125d040b167112 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=69cfa3f0156d04c6605ba3cefb125d040b167112
Author: Lars Michelsen <[email protected]> Date: Mon Aug 31 12:08:48 2009 +0200 Conflicts: share/nagvis/includes/classes/GlobalHeaderMenu.php --- share/nagvis/includes/classes/GlobalHeaderMenu.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/share/nagvis/includes/classes/GlobalHeaderMenu.php b/share/nagvis/includes/classes/GlobalHeaderMenu.php index a9f97f3..7e71e7e 100644 --- a/share/nagvis/includes/classes/GlobalHeaderMenu.php +++ b/share/nagvis/includes/classes/GlobalHeaderMenu.php @@ -84,7 +84,7 @@ class GlobalHeaderMenu { */ public function replaceDynamicMacros() { // Replace some special macros - if(get_class($this->OBJPAGE) == 'NagVisMapCfg' || get_class($this->OBJPAGE) == 'NagVisAutomapCfg') { + if($this->OBJPAGE !== null && (get_class($this->OBJPAGE) == 'NagVisMapCfg' || get_class($this->OBJPAGE) == 'NagVisAutomapCfg')) { $arrKeys[] = '[current_map]'; $arrKeys[] = '[current_map_alias]'; $arrVals[] = $this->OBJPAGE->getName(); ------------------------------------------------------------------------------ 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
