Index: branches/5.0.x/core/units/helpers/permissions_helper.php
===================================================================
diff -u -N -r12898 -r12970
--- branches/5.0.x/core/units/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 12898)
+++ branches/5.0.x/core/units/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 12970)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: permissions_helper.php 12898 2009-11-11 19:11:30Z alex $
+* @version	$Id: permissions_helper.php 12970 2009-12-22 11:02:37Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -264,14 +264,14 @@
 		function finalizePermissionCheck(&$event, $perm_status)
 		{
 			if (!$perm_status) {
-				$t = $this->Application->GetVar('t');
-				$redirect_params = $this->Application->HttpQuery->getRedirectParams(true);
-				$redirect_params['no_amp'] = 1;
-				$next_template = $this->Application->HREF($t, '', $redirect_params);
+				if (MOD_REWRITE) {
+//					$event->SetRedirectParam('m_cat_id', 0); // category means nothing on admin login screen
+					$event->SetRedirectParam('next_template', urlencode('external:' . $_SERVER['REQUEST_URI']));
+				}
+				else {
+					$event->SetRedirectParam('next_template', $this->Application->GetVar('t'));
+				}
 
-				$event->SetRedirectParam('m_cat_id', 0); // category means nothing on admin login screen
-				$event->SetRedirectParam('next_template', urlencode('external:' . $next_template));
-
 				if ($this->Application->isDebugMode()) {
 					// for debugging purposes
 					$event->SetRedirectParam('section', $event->getSection());
@@ -462,10 +462,16 @@
 				$redirect_params['pass_category'] = $params['pass_cateogry'];
 			}
 
-			$redirect_params = Array (
-				'm_cat_id' => 0, // category means nothing on admin login screen
-				'next_template' => urlencode('external:' . $this->Application->HREF($t, '', $redirect_params)),
-			);
+			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, // category means nothing on admin login screen
+					'next_template' => urlencode('external:' . $_SERVER['REQUEST_URI']),
+				);
+			}
+			else {
+				$redirect_params['next_template'] = $t;
+			}
 
 			if ($this->Application->isAdmin) {
 				$redirect_params['m_wid'] = ''; // remove wid, otherwise parent window may add wid to its name breaking all the frameset (for <a> targets)