Index: branches/unlabeled/unlabeled-1.76.2/core/units/users/users_event_handler.php =================================================================== diff -u -r8121 -r8183 --- branches/unlabeled/unlabeled-1.76.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 8121) +++ branches/unlabeled/unlabeled-1.76.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 8183) @@ -118,12 +118,14 @@ if ($this->Application->GetVar('admin') == 1) { $session_admin =& $this->Application->recallObject('Session.admin'); /* @var $session_admin Session */ + if (!$session_admin->LoggedIn()) { // front-end session created from admin session & both expired $this->Application->DeleteVar('admin'); $this->Application->Redirect('index', Array('expired' => 1), '', 'admin/index.php'); } } + $get = $this->Application->HttpQuery->getRedirectParams(); $t = $this->Application->GetVar('t'); $get['js_redirect'] = $this->Application->ConfigValue('UseJSRedirect');