Index: branches/5.2.x/core/units/helpers/permissions_helper.php
===================================================================
diff -u -N -r15761 -r15856
--- branches/5.2.x/core/units/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 15761)
+++ branches/5.2.x/core/units/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 15856)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: permissions_helper.php 15761 2013-05-16 15:49:10Z alex $
+* @version	$Id: permissions_helper.php 15856 2013-07-02 14:56:00Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -283,7 +283,7 @@
 			if (!$perm_status) {
 				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']));
+					$event->SetRedirectParam('next_template', kUtil::escape('external:' . $_SERVER['REQUEST_URI'], kUtil::ESCAPE_URL));
 				}
 				else {
 					$event->SetRedirectParam('next_template', $this->Application->GetVar('t'));
@@ -500,7 +500,7 @@
 				// 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']),
+					'next_template' => kUtil::escape('external:' . $_SERVER['REQUEST_URI'], kUtil::ESCAPE_URL),
 				);
 			}
 			else {