From c9f36b3bf1001e4ace5153a605a9527e386055c7 Mon Sep 17 00:00:00 2001
From: michaeljoseph <michaeljoseph@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 29 Jul 2004 10:20:39 +0000
Subject: [PATCH] Corrected style convention violations. Added some variable initialisation and instantiation checking (to remove spurious E_NOTICEs)

---
 lib/session/SiteMap.inc |  9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/session/SiteMap.inc b/lib/session/SiteMap.inc
index a04110d..f2c9e80 100644
--- a/lib/session/SiteMap.inc
+++ b/lib/session/SiteMap.inc
@@ -149,13 +149,10 @@ class SiteMap {
             // if you're a system administrator, you've got access to everything
            
            // check whether global var intialised
-            if ($this->isSysAdmin)
-            {
+            if ($this->isSysAdmin) {
             	$default->log->debug("-- SiteMap - checking whether a sys admin - GLOBAL VAR SET ");
             	return true; 
-            }
-			else if ($this->isSysAdmin = Permission::userIsSystemAdministrator()) 
-			{
+            } else if ($this->isSysAdmin = Permission::userIsSystemAdministrator()) {
             	$default->log->debug("-- SiteMap - checking whether a sys admin ..."); 
                 return true;
             } else {
@@ -390,7 +387,7 @@ class SiteMap {
     function getPageArray($action) {
         global $default;
 
-        $default->log->info("SiteMap::getPage: checking ($action, " . $_SESSION["userID"] . ")");
+        $default->log->info("SiteMap::getPage: checking ($action, " . (isset($_SESSION["userID"]) ? $_SESSION["userID"] : "") . ")");
         $groupIDs = array();
 
         // for each section
--
libgit2 0.21.4