Index: branches/5.3.x/admin_templates/user_item_tab.tpl
===================================================================
diff -u -r15490 -r16105
--- branches/5.3.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 15490)
+++ branches/5.3.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 16105)
@@ -15,7 +15,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_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="TopicId" grid="$grid_name" menu_filters="yes"/>
@@ -31,4 +31,4 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:bb_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file
+<inp2:bb_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.3.x/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r15490 -r16105
--- branches/5.3.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 15490)
+++ branches/5.3.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16105)
@@ -29,7 +29,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_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="TopicId" grid="$grid_name" menu_filters="yes"/>
@@ -53,4 +53,4 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:bb_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file
+<inp2:bb_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.3.x/install/upgrades.php
===================================================================
diff -u -r15924 -r16105
--- branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 15924)
+++ branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 16105)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 15924 2013-07-30 10:02:25Z alex $
+* @version	$Id: upgrades.php 16105 2014-12-07 11:22:00Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -64,6 +64,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/units/private_messages/private_message_eh.php
===================================================================
diff -u -r15935 -r16105
--- branches/5.3.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 15935)
+++ branches/5.3.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 16105)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_message_eh.php 15935 2013-08-14 09:32:33Z alex $
+* @version	$Id: private_message_eh.php 16105 2014-12-07 11:22:00Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -123,7 +123,7 @@
 
 			// 1. create message body (for sender & recipient)
 			$copy_fields = Array ('Subject', 'Body', 'ShowSignatures', 'DisableSmileys', 'DisableBBCodes');
-			$message_body->SetDBFieldsFromHash($object->GetFieldValues(), null, $copy_fields);
+			$message_body->SetDBFieldsFromHash($object->GetFieldValues(), $copy_fields);
 
 			$body_created = $message_body->Create();
 			if ( $body_created ) {
@@ -297,4 +297,4 @@
 				$object->SetDBField('ToId', $user_id);
 			}
 		}
-	}
\ No newline at end of file
+	}
Index: branches/5.3.x/install/upgrades.sql
===================================================================
diff -u -r15924 -r16105
--- branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15924)
+++ branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 16105)
@@ -274,4 +274,6 @@
 
 # ===== v 5.2.1-RC1 =====
 
+# ===== v 5.2.1 =====
+
 # ===== v 5.3.0-B1 =====
Index: branches/5.3.x/units/helpers/post_helper.php
===================================================================
diff -u -r15924 -r16105
--- branches/5.3.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 15924)
+++ branches/5.3.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 16105)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_helper.php 15924 2013-07-30 10:02:25Z alex $
+* @version	$Id: post_helper.php 16105 2014-12-07 11:22:00Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -399,6 +399,7 @@
 		 * @param string $input_string code line to highlight
 		 * @param string $bbcode_element block name used for bbcode descoration
 		 * @return string
+		 * @see    parsePostBody about why we unescape here.
 		 */
 		function replaceCodeBBCode($input_string, $bbcode_element)
 		{
@@ -409,7 +410,7 @@
 				$bbcode_mask = trim($this->Application->ParseBlock($block_params));
 			}
 
-			$input_string = trim( str_replace('\"','"', htmlspecialchars_decode($input_string)) );
+			$input_string = trim(str_replace('\"', '"', kUtil::unescape($input_string, kUtil::ESCAPE_HTML)));
 			$input_string = $this->highlightCode($input_string);
 			$input_string = preg_replace("/\r<br \/>/s", "\r", $input_string); // undo nl2br added in highlighting
 			$input_string = str_replace('#BB_CODE#', $input_string, $bbcode_mask);
@@ -462,4 +463,4 @@
 
 			return $manager;
 		}
-	}
\ No newline at end of file
+	}