Index: branches/5.1.x/core/kernel/session/session.php
===================================================================
diff -u -N -r13492 -r13581
--- branches/5.1.x/core/kernel/session/session.php	(.../session.php)	(revision 13492)
+++ branches/5.1.x/core/kernel/session/session.php	(.../session.php)	(revision 13581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: session.php 13492 2010-05-05 16:26:34Z alex $
+* @version	$Id: session.php 13581 2010-05-19 07:33:23Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -353,7 +353,7 @@
 	function LoadPersistentVars(&$session)
 	{
 		$user_id = $session->RecallVar('user_id');
-		if ($user_id != -2) {
+		if ($user_id != USER_GUEST) {
 			// root & normal users
 			$sql = 'SELECT VariableValue, VariableName
 					FROM '.TABLE_PREFIX.'PersistantSessionData
@@ -375,7 +375,7 @@
 	function StorePersistentVar(&$session, $var_name, $var_value)
 	{
 		$user_id = $session->RecallVar('user_id');
-		if ($user_id == -2 || $user_id === false) {
+		if ($user_id == USER_GUEST || $user_id === false) {
 			// -2 (when not logged in), false (when after u:OnLogout event)
 			$session->StoreVar($var_name, $var_value);
 			return ;
@@ -414,7 +414,7 @@
 	 */
 	function RecallPersistentVar(&$session, $var_name, $default = false)
 	{
-		if ($session->RecallVar('user_id') == -2) {
+		if ($session->RecallVar('user_id') == USER_GUEST) {
 			if ($default == ALLOW_DEFAULT_SETTINGS) {
 				$default = null;
 			}
@@ -427,7 +427,7 @@
 		elseif ($default == ALLOW_DEFAULT_SETTINGS) {
 			$default_user_id = $this->Application->ConfigValue('DefaultSettingsUserId');
 			if (!$default_user_id) {
-				$default_user_id = -1;
+				$default_user_id = USER_ROOT;
 			}
 			$sql = 'SELECT VariableValue, VariableName
 					FROM '.TABLE_PREFIX.'PersistantSessionData
@@ -450,7 +450,7 @@
 
 		$user_id = $session->RecallVar('user_id');
 
-		if ($user_id != -2) {
+		if ($user_id != USER_GUEST) {
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'PersistantSessionData
 					WHERE PortalUserId = '.$user_id.' AND VariableName = '.$this->Conn->qstr($var_name);
 			$this->Conn->Query($sql);
@@ -1398,7 +1398,7 @@
 		$user_id = $this->RecallVar('user_id');
 
 		$ret = $user_id > 0;
-		if (($this->RecallVar('admin') == 1 || defined('ADMIN')) && ($user_id == -1)) {
+		if (($this->RecallVar('admin') == 1 || defined('ADMIN')) && ($user_id == USER_ROOT)) {
 			$ret = true;
 		}
 		return $ret;