Index: branches/5.3.x/admin_templates/user_item_tab.tpl
===================================================================
diff -u -r15488 -r16108
--- branches/5.3.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 15488)
+++ branches/5.3.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 16108)
@@ -16,7 +16,7 @@
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_DefineElement name="article_expire_td" no_special="">
@@ -40,4 +40,4 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file
+<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.3.x/install/upgrades.php
===================================================================
diff -u -r15927 -r16108
--- branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 15927)
+++ branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 16108)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 15927 2013-07-30 10:02:58Z alex $
+* @version	$Id: upgrades.php 16108 2014-12-07 11:47:37Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -62,6 +62,7 @@
 				'5.2.1-B1' => Array ('Core' => '5.2.1-B1'),
 				'5.2.1-B2' => Array ('Core' => '5.2.1-B2'),
 				'5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'),
+				'5.2.1' => Array ('Core' => '5.2.1'),
 				'5.3.0-B1' => Array ('Core' => '5.3.0-B1'),
 			);
 		}
Index: branches/5.3.x/install/upgrades.sql
===================================================================
diff -u -r15927 -r16108
--- branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15927)
+++ branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 16108)
@@ -148,4 +148,6 @@
 
 # ===== v 5.2.1-RC1 =====
 
+# ===== v 5.2.1 =====
+
 # ===== v 5.3.0-B1 =====
Index: branches/5.3.x/units/articles/articles_event_handler.php
===================================================================
diff -u -r15927 -r16108
--- branches/5.3.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 15927)
+++ branches/5.3.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 16108)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_event_handler.php 15927 2013-07-30 10:02:58Z alex $
+* @version	$Id: articles_event_handler.php 16108 2014-12-07 11:47:37Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -336,7 +336,7 @@
 					break;
 
 				case 'html':
-					$data = htmlspecialchars_decode( $node->GetXML(true) ); // $node->firstChild->Data // $node->Data
+					$data = kUtil::unescape($node->GetXML(true), kUtil::ESCAPE_HTML); // $node->firstChild->Data // $node->Data
 					break;
 
 				default:
@@ -591,4 +591,4 @@
 				$master_config->setClones($clones);
 			}
 		}
-	}
\ No newline at end of file
+	}
Index: branches/5.3.x/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r15488 -r16108
--- branches/5.3.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 15488)
+++ branches/5.3.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16108)
@@ -28,7 +28,7 @@
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_DefineElement name="article_expire_td" no_special="">
@@ -61,4 +61,4 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file
+<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>