Index: branches/5.2.x/core/kernel/managers/rewrite_url_processor.php
===================================================================
diff -u -N -r15862 -r16339
--- branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(.../rewrite_url_processor.php)	(revision 15862)
+++ branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(.../rewrite_url_processor.php)	(revision 16339)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: rewrite_url_processor.php 15862 2013-07-04 09:48:57Z alex $
+* @version	$Id: rewrite_url_processor.php 16339 2016-04-02 13:45:52Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -944,13 +944,6 @@
 		$ret = '';
 		$env = '';
 
-		$encode = false;
-
-		if ( isset($params['__URLENCODE__']) ) {
-			$encode = $params['__URLENCODE__'];
-			unset($params['__URLENCODE__']);
-		}
-
 		if ( isset($params['__SSL__']) ) {
 			unset($params['__SSL__']);
 		}
@@ -1054,29 +1047,14 @@
 
 		unset($params['pass'], $params['opener'], $params['m_event']);
 
-		if ( array_key_exists('escape', $params) && $params['escape'] ) {
-			$ret = addslashes($ret);
-			unset($params['escape']);
-		}
-
 		// TODO: why?
-		$ret = str_replace('%2F', '/', urlencode($ret));
+//		$ret = str_replace('%2F', '/', urlencode($ret));
 
 		if ( $params ) {
-			$params_str = '';
-			$join_string = $encode ? '&' : '&amp;';
-
-			foreach ($params as $param => $value) {
-				$params_str .= $join_string . $param . '=' . $value;
-			}
-
-			$ret .= '?' . substr($params_str, strlen($join_string));
+			$params_str = http_build_query($params);
+			$ret .= '?' . str_replace('%23', '#', $params_str);
 		}
 
-		if ( $encode ) {
-			$ret = str_replace('\\', '%5C', $ret);
-		}
-
 		return $ret;
 	}