Index: branches/5.1.x/core/kernel/application.php
===================================================================
diff -u -r13559 -r13581
--- branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13559)
+++ branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 13559 2010-05-12 09:36:46Z alex $
+* @version	$Id: application.php 13581 2010-05-19 07:33:23Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2212,8 +2212,8 @@
 		$session =& $this->recallObject('Session');
 		$user_id = $session->GetField('PortalUserId');
 
-		if (!$user_id && $user_id != -1) {
-			$user_id = -2;
+		if (!$user_id && $user_id != USER_ROOT) {
+			$user_id = USER_GUEST;
 		}
 
 		$this->SetVar('u.current_id', $user_id);
@@ -2223,7 +2223,7 @@
 			$this->SetVar('u_id', $user_id);
 		}
 
-		$this->StoreVar('user_id', $user_id, $user_id == -2); // storing Guest user_id (-2) is optional
+		$this->StoreVar('user_id', $user_id, $user_id == USER_GUEST); // storing Guest user_id (-2) is optional
 
 		$this->isAdminUser = $this->isAdmin && $this->LoggedIn();
 
@@ -2233,12 +2233,12 @@
 			$user->SetError('ValidateLogin', 'session_expired', 'la_text_sess_expired');
 		}
 
-		if (($user_id != -2) && constOn('DBG_REQUREST_LOG') ) {
+		if (($user_id != USER_GUEST) && constOn('DBG_REQUREST_LOG') ) {
 			$http_query =& $this->recallObject('HTTPQuery');
 			$http_query->writeRequestLog(DBG_REQUREST_LOG);
 		}
 
-		if ($user_id != -2) {
+		if ($user_id != USER_GUEST) {
 			// normal users + root
 			$this->LoadPersistentVars();
 		}
@@ -3081,11 +3081,11 @@
 	function getUserGroups($user_id)
 	{
 		switch ($user_id) {
-			case -1:
+			case USER_ROOT:
 				$user_groups = $this->ConfigValue('User_LoggedInGroup');
 				break;
 
-			case -2:
+			case USER_GUEST:
 				$user_groups = $this->ConfigValue('User_LoggedInGroup') . ',' . $this->ConfigValue('User_GuestGroup');
 				break;