Index: branches/5.3.x/units/links/link_tag_processor.php
===================================================================
diff -u -r15979 -r16107
--- branches/5.3.x/units/links/link_tag_processor.php	(.../link_tag_processor.php)	(revision 15979)
+++ branches/5.3.x/units/links/link_tag_processor.php	(.../link_tag_processor.php)	(revision 16107)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: link_tag_processor.php 15979 2013-10-03 14:36:18Z alex $
+* @version	$Id: link_tag_processor.php 16107 2014-12-07 11:43:31Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -389,7 +389,7 @@
 		$block_params['name'] = $template_name;
 
 		// parse template
-		return $this->Application->ParseBlock($block_params);
+		return $this->Application->IncludeTemplate($block_params);
 	}
 
 	/**
@@ -461,4 +461,4 @@
 
 		$fields_hash['LinkId'] = base64_encode( serialize($key_fields) );
 	}
-}
\ No newline at end of file
+}
Index: branches/5.3.x/units/link_validation/link_validation_eh.php
===================================================================
diff -u -r15926 -r16107
--- branches/5.3.x/units/link_validation/link_validation_eh.php	(.../link_validation_eh.php)	(revision 15926)
+++ branches/5.3.x/units/link_validation/link_validation_eh.php	(.../link_validation_eh.php)	(revision 16107)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: link_validation_eh.php 15926 2013-07-30 10:02:48Z alex $
+* @version	$Id: link_validation_eh.php 16107 2014-12-07 11:43:31Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -342,7 +342,7 @@
 
 			$result = $curl_helper->Send($link_data['Url']);
 			if ( $result === false || $curl_helper->lastErrorMsg != '' ) {
-				$curl_helper->lastErrorCode = 500;
+				$curl_helper->lastHTTPCode = 500;
 			}
 
 			$link_validation = $this->Application->recallObject($this->Prefix . '.-item', null, Array ('skip_autoload' => true));
Index: branches/5.3.x/admin_templates/user_item_tab.tpl
===================================================================
diff -u -r15486 -r16107
--- branches/5.3.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 15486)
+++ branches/5.3.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 16107)
@@ -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="LinkId" grid="$grid_name" menu_filters="yes"/>
@@ -31,4 +31,4 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:l_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file
+<inp2:l_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.3.x/admin_templates/duplicate_checker.tpl
===================================================================
diff -u -r15486 -r16107
--- branches/5.3.x/admin_templates/duplicate_checker.tpl	(.../duplicate_checker.tpl)	(revision 15486)
+++ branches/5.3.x/admin_templates/duplicate_checker.tpl	(.../duplicate_checker.tpl)	(revision 16107)
@@ -41,7 +41,7 @@
 						$Menus['l.duplicates_grouping_menu'].applyBorder(false, false, false, false);
 						$Menus['l.duplicates_grouping_menu'].dropShadow("none");
 						$Menus['l.duplicates_grouping_menu'].showIcon = true;
-						<inp2:m_Get name="m_lang" result_to_var="language"/>
+						<inp2:m_Get name="m_lang" no_html_escape="1" result_to_var="language"/>
 						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name'), 'Name', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language"/>_Name|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|">,['img/check_on.gif']</inp2:m_if>);
 						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.url'), 'Url',  'javascript:set_grouping("l.duplicates", "|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|Url|">,['img/check_on.gif']</inp2:m_if>);
 						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name.url'), 'Name <inp2:m_phrase name="la_and"/> Url', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language"/>_Name|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|Url|">,['img/check_on.gif']</inp2:m_if>);
@@ -70,4 +70,4 @@
 	Grids['l.duplicates'].SetDependantToolbarButtons( new Array('edit') );
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.3.x/install/upgrades.php
===================================================================
diff -u -r15926 -r16107
--- branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 15926)
+++ branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 16107)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 15926 2013-07-30 10:02:48Z alex $
+* @version	$Id: upgrades.php 16107 2014-12-07 11:43:31Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -63,6 +63,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/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r15486 -r16107
--- branches/5.3.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 15486)
+++ branches/5.3.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16107)
@@ -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_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="LinkId" grid="$grid_name" menu_filters="yes"/>
@@ -52,4 +52,4 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:l_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file
+<inp2:l_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.3.x/install/upgrades.sql
===================================================================
diff -u -r15926 -r16107
--- branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15926)
+++ branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 16107)
@@ -204,4 +204,6 @@
 
 # ===== v 5.2.1-RC1 =====
 
+# ===== v 5.2.1 =====
+
 # ===== v 5.3.0-B1 =====