Index: branches/5.2.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r16273 -r16339
--- branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 16273)
+++ branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 16339)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 16273 2015-09-27 10:18:20Z alex $
+* @version	$Id: main_processor.php 16339 2016-04-02 13:45:52Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -140,7 +140,22 @@
 
 		unset($params['t'], $params['template'], $params['prefix']);
 
-		return $this->Application->HREF($template, $prefix, $params);
+		$no_html_escape = false;
+
+		if ( isset($params['no_amp']) ) {
+			$no_html_escape = $params['no_amp'];
+			unset($params['no_amp']);
+		}
+
+		$ret = $this->Application->HREF($template, $prefix, $params);
+
+		if ( !$no_html_escape ) {
+			// most of the time links are placed into HTML document
+			// TODO: in future always do escaping according to current "escape context"
+			$ret = kUtil::escape($ret, kUtil::ESCAPE_HTML);
+		}
+
+		return $ret;
 	}
 
 	function Link($params)
@@ -910,7 +925,7 @@
 				// 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' => kUtil::escape('external:' . $_SERVER['REQUEST_URI'], kUtil::ESCAPE_URL),
+					'next_template' => 'external:' . $_SERVER['REQUEST_URI'],
 				);
 			}
 			else {