Index: branches/5.0.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -r12877 -r12898
--- branches/5.0.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 12877)
+++ branches/5.0.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 12898)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 12877 2009-11-03 20:10:32Z alex $
+* @version	$Id: main_processor.php 12898 2009-11-11 19:11:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -768,16 +768,26 @@
 
 		if ((!$this->Application->LoggedIn() || !$group_access) && $condition) {
 			$redirect_params = $this->Application->HttpQuery->getRedirectParams(true);
+			$redirect_params['no_amp'] = 1;
 
 			if (array_key_exists('pass_category', $params)) {
 				$redirect_params['pass_category'] = $params['pass_category'];
 			}
 
+			if (array_key_exists('expired', $redirect_params)) {
+				$session_expired = $redirect_params['expired'];
+				unset($redirect_params['expired']);
+			}
+
 			$redirect_params = Array (
 				'm_cat_id' => 0,
 				'next_template' => urlencode('external:' . $this->Application->HREF($t, '', $redirect_params)),
 			);
 
+			if (isset($session_expired) && $session_expired) {
+				$redirect_params['expired'] = $session_expired;
+			}
+
 			if ( $this->Application->LoggedIn() && !$group_access) {
 				$this->Application->Redirect($params['no_group_perm_template'], $redirect_params);
 			}