Index: branches/5.0.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -r12898 -r12970
--- branches/5.0.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 12898)
+++ branches/5.0.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 12970)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 12898 2009-11-11 19:11:30Z alex $
+* @version	$Id: main_processor.php 12970 2009-12-22 11:02:37Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -768,24 +768,20 @@
 
 		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']);
+			if (MOD_REWRITE) {
+				// TODO: $next_t variable is ignored !!! (is anyone using m_RequireLogin tag with "next_template" parameter?)
+				$redirect_params = Array (
+					'm_cat_id' => 0,
+					'next_template' => urlencode('external:' . $_SERVER['REQUEST_URI']),
+				);
 			}
-
-			$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;
+			else {
+				$redirect_params['next_template'] = $t;
 			}
 
 			if ( $this->Application->LoggedIn() && !$group_access) {