Index: branches/5.2.x/core/kernel/processors/tag_processor.php
===================================================================
diff -u -N -r15601 -r15856
--- branches/5.2.x/core/kernel/processors/tag_processor.php	(.../tag_processor.php)	(revision 15601)
+++ branches/5.2.x/core/kernel/processors/tag_processor.php	(.../tag_processor.php)	(revision 15856)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: tag_processor.php 15601 2012-11-02 14:18:43Z alex $
+* @version	$Id: tag_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
@@ -202,12 +202,10 @@
 		function PostProcess($ret, $flag_values)
 		{
 			if ($flag_values['html_escape']) {
-				$ret = htmlspecialchars($ret, null, CHARSET);
+				$ret = kUtil::escape($ret, kUtil::ESCAPE_HTML);
 			}
 			if ($flag_values['js_escape']) {
-				$ret = addslashes($ret);
-				$ret = str_replace(Array("\r", "\n"), Array('\r', '\n'), $ret);
-				$ret = str_replace('</script>', "</'+'script>", $ret);
+				$ret = kUtil::escape($ret, kUtil::ESCAPE_JS);
 			}
 			if ($flag_values['strip_nl']) {
 				// 1 - strip \r,\n; 2 - strip tabs too
@@ -329,7 +327,7 @@
 	{
 		// echo " prefix : $prefix <br>";
 		if (!isset($this->Prefixes[$prefix]))
-			$this->Application->ApplicationDie ("<b>Filepath and ClassName for prefix $prefix not defined while processing ".htmlspecialchars($tag->GetFullTag(), null, CHARSET)."!</b>");
+			$this->Application->ApplicationDie ("<b>Filepath and ClassName for prefix $prefix not defined while processing ".kUtil::escape($tag->GetFullTag())."!</b>");
 		include_once($this->Prefixes[$prefix]['path']);
 		$ClassName = $this->Prefixes[$prefix]['class'];
 		$a_processor = new $ClassName($prefix);