Index: branches/5.0.x/core/units/users/users_event_handler.php
===================================================================
diff -u -r12466 -r12483
--- branches/5.0.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 12466)
+++ branches/5.0.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 12483)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 12466 2009-09-08 15:14:28Z alex $
+* @version	$Id: users_event_handler.php 12483 2009-09-13 11:23:28Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -464,18 +464,21 @@
 
 			$this->Application->HandleEvent($dummy, 'session-log:OnEndSession');
 
-			$session =& $this->Application->recallObject('Session');
-			$session->SetField('PortalUserId', -2);
 			$this->Application->SetVar('u.current_id', -2);
-			$this->Application->StoreVar('user_id', -2);
 			$object =& $this->Application->recallObject('u.current', null, Array('skip_autoload' => true));
 			$object->Load(-2);
 
 			$this->Application->DestroySession();
 
-			$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
+			$session =& $this->Application->recallObject('Session');
+			/* @var $session Session */
+
+			$group_list = $this->Application->ConfigValue('User_GuestGroup') . ',' . $this->Application->ConfigValue('User_LoggedInGroup');
+
+			$session->SetField('PortalUserId', -2);
 			$session->SetField('GroupList', $group_list);
-			$this->Application->StoreVar('UserGroups', $group_list);
+			$this->Application->StoreVar('user_id', -2, true);
+			$this->Application->StoreVar('UserGroups', $group_list, true);
 
 			if ($this->Application->ConfigValue('UseJSRedirect')) {
 				$event->SetRedirectParam('js_redirect', 1);