Index: trunk/core/units/general/inp_ses_storage.php
===================================================================
diff -u -N -r2785 -r2946
--- trunk/core/units/general/inp_ses_storage.php (.../inp_ses_storage.php) (revision 2785)
+++ trunk/core/units/general/inp_ses_storage.php (.../inp_ses_storage.php) (revision 2946)
@@ -26,7 +26,8 @@
$this->SetCookieDomain(SERVER_NAME);
parent::Init($prefix,$special);
- if (!defined('ADMIN')) {
+ if( !$this->Application->IsAdmin() && $this->GetField('PortalUserId') <= 0 )
+ {
$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
$this->SetField('GroupList', $group_list);
}
Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -N -r2836 -r2946
--- trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2836)
+++ trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2946)
@@ -62,6 +62,7 @@
{
$session =& $this->Application->recallObject('Session');
$session->SetField('PortalUserId', $user_id);
+ $session->SetField('GroupList', implode(',', $groups) );
$this->Application->SetVar('u_id', $user_id);
$this->Application->StoreVar('user_id', $user_id);
$this->Application->setVisitField('PortalUserId', $user_id);
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r2836 -r2946
--- trunk/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2836)
+++ trunk/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2946)
@@ -62,6 +62,7 @@
{
$session =& $this->Application->recallObject('Session');
$session->SetField('PortalUserId', $user_id);
+ $session->SetField('GroupList', implode(',', $groups) );
$this->Application->SetVar('u_id', $user_id);
$this->Application->StoreVar('user_id', $user_id);
$this->Application->setVisitField('PortalUserId', $user_id);
Index: trunk/themes/default/common/head.tpl
===================================================================
diff -u -N -r2746 -r2946
--- trunk/themes/default/common/head.tpl (.../head.tpl) (revision 2746)
+++ trunk/themes/default/common/head.tpl (.../head.tpl) (revision 2946)
@@ -1,3 +1,4 @@
+
Index: trunk/themes/default/my_account.tpl
===================================================================
diff -u -N -r2765 -r2946
--- trunk/themes/default/my_account.tpl (.../my_account.tpl) (revision 2765)
+++ trunk/themes/default/my_account.tpl (.../my_account.tpl) (revision 2946)
@@ -1,3 +1,4 @@
+
Index: trunk/kernel/units/general/inp_ses_storage.php
===================================================================
diff -u -N -r2785 -r2946
--- trunk/kernel/units/general/inp_ses_storage.php (.../inp_ses_storage.php) (revision 2785)
+++ trunk/kernel/units/general/inp_ses_storage.php (.../inp_ses_storage.php) (revision 2946)
@@ -26,7 +26,8 @@
$this->SetCookieDomain(SERVER_NAME);
parent::Init($prefix,$special);
- if (!defined('ADMIN')) {
+ if( !$this->Application->IsAdmin() && $this->GetField('PortalUserId') <= 0 )
+ {
$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
$this->SetField('GroupList', $group_list);
}