Index: branches/5.2.x/core/kernel/managers/url_manager.php
===================================================================
diff -u -N -r15856 -r16339
--- branches/5.2.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 15856)
+++ branches/5.2.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 16339)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: url_manager.php 15856 2013-07-02 14:56:00Z alex $
+* @version	$Id: url_manager.php 16339 2016-04-02 13:45:52Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -172,11 +172,6 @@
 			unset($params['anchor']);
 		}
 
-		if ( isset($params['no_amp']) ) {
-			$params['__URLENCODE__'] = $params['no_amp'];
-			unset($params['no_amp']);
-		}
-
 		$rewrite = true;
 		if ( isset($params['__NO_REWRITE__']) ) {
 			$rewrite = false;
@@ -242,11 +237,6 @@
 		list($index_file, $env) = explode('|', $opener_stack->get(kOpenerStack::LAST_ELEMENT, true));
 		$ret = $this->Application->BaseURL($prefix, $ssl) . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
 
-		// TODO: tag, which uses resulting url should do escaping
-		if ( isset($params['escape']) && $params['escape'] ) {
-			$ret = kUtil::escape($ret, kUtil::ESCAPE_JS);
-		}
-
 		if ( isset($params['m_opener']) && $params['m_opener'] == 'u' ) {
 			$opener_stack->pop();
 			$opener_stack->save(true);