[Nagvis-checkins] SF.net Git: nagvis: #90 Fixed warning messages with php 5.3

[lars <la...@us...>]

Module: nagvis
Branch: nagvis-1.4
Commit: a68cf607ec4cca82af0561b55b939029a1ee82a2
URL:    http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=a68cf607ec4cca82af0561b55b939029a1ee82a2

Author: Lars Michelsen <la...@ve...>
Date:   Mon Aug 31 12:05:36 2009 +0200

#90 Fixed warning messages with php 5.3

---

 .../nagvis/includes/classes/GlobalHeaderMenu.php   |    2 +-
 nagvis/nagvis/includes/classes/NagVisFrontend.php  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nagvis/nagvis/includes/classes/GlobalHeaderMenu.php b/nagvis/nagvis/includes/classes/GlobalHeaderMenu.php
index cd4ef4e..f2cfd37 100644
--- a/nagvis/nagvis/includes/classes/GlobalHeaderMenu.php
+++ b/nagvis/nagvis/includes/classes/GlobalHeaderMenu.php
@@ -84,7 +84,7 @@ class GlobalHeaderMenu {
 	 */
 	public function replaceDynamicMacros() {
 		// Replace some special macros
-		if(get_class($this->OBJPAGE) == 'NagVisMapCfg') {
+		if($this->OBJPAGE !== null && get_class($this->OBJPAGE) == 'NagVisMapCfg') {
 			$arrKeys[] = '[current_map]';
 			$arrKeys[] = '[current_map_alias]';
 			$arrVals[] = $this->OBJPAGE->getName();
diff --git a/nagvis/nagvis/includes/classes/NagVisFrontend.php b/nagvis/nagvis/includes/classes/NagVisFrontend.php
index 03c8331..485d300 100644
--- a/nagvis/nagvis/includes/classes/NagVisFrontend.php
+++ b/nagvis/nagvis/includes/classes/NagVisFrontend.php
@@ -86,7 +86,7 @@ class NagVisFrontend extends GlobalPage {
 		$prop['languageRoot'] = 'nagvis';
 		
 		// Only do this, when a map needs to be displayed
-		if(get_class($this->MAPCFG) != '') {
+		if($this->MAPCFG !== null && get_class($this->MAPCFG) != '') {
 			$prop['allowedUsers'] = $this->MAPCFG->getValue('global',0, 'allowed_user');
 		}