Index: branches/5.2.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r15615 -r15856
--- branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 15615)
+++ branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 15856)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 15615 2012-11-07 12:10:28Z alex $
+* @version	$Id: main_processor.php 15856 2013-07-02 14:56:00Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -304,11 +304,11 @@
 
 		$ret = ($ret === false && isset($params['no_null'])) ? '' : $ret;
 		if (getArrayValue($params, 'special') || getArrayValue($params, 'htmlchars')) {
-			$ret = htmlspecialchars($ret, null, CHARSET);
+			$ret = kUtil::escape($ret, kUtil::ESCAPE_HTML);
 		}
 
 		if (getArrayValue($params, 'urlencode')) {
-			$ret = urlencode($ret);
+			$ret = kUtil::escape($ret, kUtil::ESCAPE_URL);
 		}
 
 		return $ret;
@@ -610,8 +610,7 @@
 		}
 
 		if ( isset($params['escape']) && $params['escape'] ) {
-			$translation = htmlspecialchars($translation, ENT_QUOTES, CHARSET);
-			$translation = addslashes($translation);
+			$translation = kUtil::escape($translation, kUtil::ESCAPE_HTML . '+' . kUtil::ESCAPE_JS);
 		}
 
 		return $translation;
@@ -899,7 +898,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' => urlencode('external:' . $_SERVER['REQUEST_URI']),
+					'next_template' => kUtil::escape('external:' . $_SERVER['REQUEST_URI'], kUtil::ESCAPE_URL),
 				);
 			}
 			else {