Index: branches/5.2.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r15268 -r15314
--- branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 15268)
+++ branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 15268 2012-04-04 13:55:40Z alex $
+* @version	$Id: categories_event_handler.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2265,7 +2265,7 @@
 		function OnUpdatePreviewBlock($event)
 		{
 			$event->status = kEvent::erSTOP;
-			$string = kUtil::unhtmlentities($this->Application->GetVar('preview_content'));
+			$string = htmlspecialchars_decode($this->Application->GetVar('preview_content'));
 
 			$category_helper = $this->Application->recallObject('CategoryHelper');
 			/* @var $category_helper CategoryHelper */
@@ -2286,7 +2286,7 @@
 			$event->redirect = false;
 			$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 
-			$keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) );
+			$keywords = htmlspecialchars_decode( trim($this->Application->GetVar('keywords')) );
 
 			$query_object = $this->Application->recallObject('HTTPQuery');
 			/* @var $query_object kHTTPQuery */
Index: branches/5.2.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r15278 -r15314
--- branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 15278)
+++ branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 15278 2012-04-08 21:01:41Z alex $
+* @version	$Id: main_processor.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -408,7 +408,7 @@
 		}
 
 		if (array_key_exists('no_html_escape', $params) && $params['no_html_escape']) {
-			return kUtil::unhtmlentities($ret);
+			return htmlspecialchars_decode($ret);
 		}
 
 		return $ret;
Index: branches/5.2.x/core/kernel/utility/formatters/formatter.php
===================================================================
diff -u -N -r15137 -r15314
--- branches/5.2.x/core/kernel/utility/formatters/formatter.php	(.../formatter.php)	(revision 15137)
+++ branches/5.2.x/core/kernel/utility/formatters/formatter.php	(.../formatter.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: formatter.php 15137 2012-03-04 08:06:21Z alex $
+* @version	$Id: formatter.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -75,7 +75,7 @@
 			elseif ( $field_type == 'string' ) {
 				if ( !$this->Application->isAdmin && isset($options['allow_html']) && $options['allow_html'] ) {
 					// this allows to revert htmlspecialchars call for each field submitted on front-end
-					$value = kUtil::unhtmlentities($value);
+					$value = htmlspecialchars_decode($value);
 				}
 
 				return $value;
Index: branches/5.2.x/core/units/thesaurus/thesaurus_eh.php
===================================================================
diff -u -N -r15145 -r15314
--- branches/5.2.x/core/units/thesaurus/thesaurus_eh.php	(.../thesaurus_eh.php)	(revision 15145)
+++ branches/5.2.x/core/units/thesaurus/thesaurus_eh.php	(.../thesaurus_eh.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: thesaurus_eh.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: thesaurus_eh.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -32,7 +32,7 @@
 			/* @var $object kDBList */
 
 			if ( !$this->Application->isAdminUser ) {
-				$keywords = kUtil::unhtmlentities(trim($this->Application->GetVar('keywords')));
+				$keywords = htmlspecialchars_decode(trim($this->Application->GetVar('keywords')));
 				$object->addFilter('search_filter', '%1$s.SearchTerm LIKE ' . $this->Conn->qstr($keywords) . ' OR %1$s.SearchTerm LIKE ' . $this->Conn->qstr($keywords . '_'));
 			}
 		}
Index: branches/5.2.x/core/kernel/globals.php
===================================================================
diff -u -N -r15246 -r15314
--- branches/5.2.x/core/kernel/globals.php	(.../globals.php)	(revision 15246)
+++ branches/5.2.x/core/kernel/globals.php	(.../globals.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: globals.php 15246 2012-03-27 11:51:06Z alex $
+* @version	$Id: globals.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -302,21 +302,6 @@
 	}
 
 	/**
-	 * Reverts effects of "htmlspecialchars" function
-	 *
-	 * @param string $string
-	 * @return string
-	 * @access public
-	 */
-	public static function unhtmlentities($string)
-	{
-		$trans_tbl = get_html_translation_table(HTML_ENTITIES); // from PHP 5.3.4: , ENT_COMPAT, 'utf-8');
-		$trans_tbl = array_flip ($trans_tbl);
-
-		return strtr($string, $trans_tbl);
-	}
-
-	/**
 	 * submits $url with $post as POST
 	 *
 	 * @param string $url
Index: branches/5.2.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r15274 -r15314
--- branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 15274)
+++ branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 15274 2012-04-05 13:15:10Z alex $
+* @version	$Id: categories_tag_processor.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -942,7 +942,7 @@
 	 */
 	protected function SpellingSuggestions($params)
 	{
-		$keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) );
+		$keywords = htmlspecialchars_decode( trim($this->Application->GetVar('keywords')) );
 		if ( !$keywords ) {
 			return '';
 		}
Index: branches/5.2.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r15145 -r15314
--- branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 15145)
+++ branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_event_handler.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: cat_event_handler.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1090,7 +1090,7 @@
 		$event->redirect = false;
 		$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 
-		$keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) );
+		$keywords = htmlspecialchars_decode( trim($this->Application->GetVar('keywords')) );
 
 		$query_object = $this->Application->recallObject('HTTPQuery');
 		/* @var $query_object kHTTPQuery */
@@ -1634,14 +1634,14 @@
 		$condition = '';
 		switch ($record['FieldType']) {
 			case 'select':
-				$keywords[$field] = kUtil::unhtmlentities( $keywords[$field] );
+				$keywords[$field] = htmlspecialchars_decode( $keywords[$field] );
 				if ($keywords[$field]) {
 					$condition = sprintf($condition_patterns['is'], $field_name, $this->Conn->qstr( $keywords[$field] ));
 				}
 				break;
 
 			case 'multiselect':
-				$keywords[$field] = kUtil::unhtmlentities( $keywords[$field] );
+				$keywords[$field] = htmlspecialchars_decode( $keywords[$field] );
 				if ($keywords[$field]) {
 					$condition = Array ();
 					$values = explode('|', substr($keywords[$field], 1, -1));
@@ -1653,7 +1653,7 @@
 				break;
 
 			case 'text':
-				$keywords[$field] = kUtil::unhtmlentities( $keywords[$field] );
+				$keywords[$field] = htmlspecialchars_decode( $keywords[$field] );
 
 				if (mb_strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length')) {
 					$highlight_keywords[] = $keywords[$field];
Index: branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php
===================================================================
diff -u -N -r15145 -r15314
--- branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 15145)
+++ branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_eh.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: form_submissions_eh.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -262,7 +262,7 @@
 			$theme = $this->Application->recallObject('theme.current');
 			/* @var $theme kDBItem */
 
-			$template = kUtil::unhtmlentities($this->Application->GetVar('success_template')); // kHTTPQuery do htmlspecialchars on everything
+			$template = htmlspecialchars_decode($this->Application->GetVar('success_template')); // kHTTPQuery do htmlspecialchars on everything
 			$alias_template = $theme->GetField('TemplateAliases', $template);
 
 			$event->redirect = $alias_template ? $alias_template : $template;
Index: branches/5.2.x/core/units/user_profile/user_profile_eh.php
===================================================================
diff -u -N -r15137 -r15314
--- branches/5.2.x/core/units/user_profile/user_profile_eh.php	(.../user_profile_eh.php)	(revision 15137)
+++ branches/5.2.x/core/units/user_profile/user_profile_eh.php	(.../user_profile_eh.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_profile_eh.php 15137 2012-03-04 08:06:21Z alex $
+* @version	$Id: user_profile_eh.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -67,7 +67,7 @@
 					}
 				}
 				else {
-					$this->Application->StorePersistentVar($variable_name, kUtil::unhtmlentities($variable_value));
+					$this->Application->StorePersistentVar($variable_name, htmlspecialchars_decode($variable_value));
 				}
 			}
 
Index: branches/5.2.x/core/units/thesaurus/thesaurus_tp.php
===================================================================
diff -u -N -r15152 -r15314
--- branches/5.2.x/core/units/thesaurus/thesaurus_tp.php	(.../thesaurus_tp.php)	(revision 15152)
+++ branches/5.2.x/core/units/thesaurus/thesaurus_tp.php	(.../thesaurus_tp.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: thesaurus_tp.php 15152 2012-03-04 09:26:24Z alex $
+* @version	$Id: thesaurus_tp.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -30,7 +30,7 @@
 
 		function _getThesaurusRecords()
 		{
-			$keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) );
+			$keywords = htmlspecialchars_decode( trim($this->Application->GetVar('keywords')) );
 			$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
 
 			$sql = 'SELECT *