Index: branches/5.1.x/units/links/links_config.php
===================================================================
diff -u -N -r14253 -r14535
--- branches/5.1.x/units/links/links_config.php	(.../links_config.php)	(revision 14253)
+++ branches/5.1.x/units/links/links_config.php	(.../links_config.php)	(revision 14535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: links_config.php 14253 2011-03-16 21:29:15Z alex $
+* @version	$Id: links_config.php 14535 2011-09-18 14:14:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -578,16 +578,16 @@
 								'NEW' => 'icon16_link_new.png',
 							),
 							'Fields' => Array (
-								'LinkId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Name' => Array ('title' => 'la_col_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ),
-								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
+								'LinkId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'Name' => Array ('title' => 'column:la_fld_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ),
+								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
 								'Url' => Array ('title' => 'la_col_LinkUrl', 'width' => 200, ),
-								'Description' => Array ('title' => 'la_col_Description', 'first_chars' => 100, 'width' => 100, ),
-								'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-								'Modified' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'Hits' => Array ('title' => 'la_col_Hits', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'CachedRating' => Array ('title' => 'la_col_Rating', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Description' => Array ('first_chars' => 100, 'width' => 100, ),
+								'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'Hits' => Array ('filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'CachedRating' => Array ('title' => 'column:la_fld_Rating', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
 								'CachedVotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
 								'CachedReviewsQty' => Array ('title' => 'la_col_ReviewCount', 'filter_block' => 'grid_range_filter', 'width' => 85, ),
 							),
@@ -602,16 +602,16 @@
 							),
 							'Selector' => 'radio',
 							'Fields' => Array (
-								'LinkId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'Name' => Array ('title' => 'la_col_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ),
-								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
+								'LinkId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Name' => Array ('title' => 'column:la_fld_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ),
+								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
 								'Url' => Array ('title' => 'la_col_LinkUrl', 'width' => 200, ),
-								'Description' => Array ('title' => 'la_col_Description', 'first_chars' => 100, 'width' => 100, ),
-								'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-								'Modified' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'Hits' => Array ('title' => 'la_col_Hits', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'CachedRating' => Array ('title' => 'la_col_Rating', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Description' => Array ('first_chars' => 100, 'width' => 100, ),
+								'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'Hits' => Array ('filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'CachedRating' => Array ('title' => 'column:la_fld_Rating', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
 								'CachedVotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
 								'CachedReviewsQty' => Array ('title' => 'la_col_ReviewCount', 'filter_block' => 'grid_range_filter', 'width' => 85, ),
 							),
@@ -626,7 +626,7 @@
 							),
 
 							'Fields' => Array (
-								'Name' => Array ('title' => 'la_col_LinkName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+								'Name' => Array ('title' => 'column:la_fld_LinkName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
 								'Url' => Array ('title' => 'la_col_LinkUrl', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
 								'DupeCount' => Array ('title' => 'la_col_DupeCount', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
 							),
Index: branches/5.1.x/install/upgrades.sql
===================================================================
diff -u -N -r14482 -r14535
--- branches/5.1.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14482)
+++ branches/5.1.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14535)
@@ -130,4 +130,9 @@
 SET VariableValue = 'in-link/links/link_detail'
 WHERE VariableName = 'l_ItemTemplate' AND VariableValue = 'in-link/designs/detail';
 
-# ===== v 5.1.3-RC2 =====
\ No newline at end of file
+# ===== v 5.1.3-RC2 =====
+
+# ===== v 5.1.3 =====
+UPDATE Phrase
+SET `Module` = 'Core'
+WHERE PhraseKey IN ('LA_FLD_LISTINGID', 'LA_FLD_LISTINGTYPE');
\ No newline at end of file
Index: branches/5.1.x/units/listings/listings_config.php
===================================================================
diff -u -N -r14253 -r14535
--- branches/5.1.x/units/listings/listings_config.php	(.../listings_config.php)	(revision 14253)
+++ branches/5.1.x/units/listings/listings_config.php	(.../listings_config.php)	(revision 14535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listings_config.php 14253 2011-03-16 21:29:15Z alex $
+* @version	$Id: listings_config.php 14535 2011-09-18 14:14:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -160,14 +160,14 @@
 								'module' => 'core',
 
 							'Fields' => Array (
-								'ListingId' => Array ( 'title' => 'la_col_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'LinkName' => Array ( 'title' => 'la_col_LinkName' , 'data_block' => 'link_td', 'filter_block' => 'grid_like_filter', 'width' => 170, ),
-								'ListingTypeId' => Array ( 'title' => 'la_col_ListingTypeName' , 'data_block' => 'listing_type_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'LinkOwner' => Array ( 'title' => 'la_col_LinkOwner', 'filter_block' => 'grid_like_filter', 'width' => 115, ),
-								'PendingRenewal' => Array ( 'title' => 'la_col_PendingRenewal', 'filter_block' => 'grid_options_filter', 'width' => 143, ),
-								'PurchasedOn' => Array ( 'title' => 'la_col_PurchasedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'ExpiresOn' => Array ( 'title' => 'la_col_ExpiresOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'Status' => Array ( 'title' => 'la_col_Status' , 'filter_block' => 'grid_options_filter'),
+								'ListingId' => Array ( 'title' => 'column:la_fld_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'LinkName' => Array ('data_block' => 'link_td', 'filter_block' => 'grid_like_filter', 'width' => 170, ),
+								'ListingTypeId' => Array ( 'title' => 'column:la_fld_ListingTypeName' , 'data_block' => 'listing_type_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'LinkOwner' => Array ('filter_block' => 'grid_like_filter', 'width' => 115, ),
+								'PendingRenewal' => Array ('filter_block' => 'grid_options_filter', 'width' => 143, ),
+								'PurchasedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+								'ExpiresOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter'),
 							),
 						),
 					),
Index: branches/5.1.x/units/link_validation/link_validation_config.php
===================================================================
diff -u -N -r14253 -r14535
--- branches/5.1.x/units/link_validation/link_validation_config.php	(.../link_validation_config.php)	(revision 14253)
+++ branches/5.1.x/units/link_validation/link_validation_config.php	(.../link_validation_config.php)	(revision 14535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: link_validation_config.php 14253 2011-03-16 21:29:15Z alex $
+* @version	$Id: link_validation_config.php 14535 2011-09-18 14:14:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -158,13 +158,13 @@
 				),
 
 				'Fields' => Array (
-					'ForeignLinkId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'module' => 'In-Link', 'width' => 60, ),
-					'LinkName' => Array ('title' => 'la_col_LinkName', 'data_block' => 'grid_link_name_td', 'filter_block' => 'grid_like_filter', 'first_chars' => 30, 'width' => 180, ),
+					'ForeignLinkId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'module' => 'In-Link', 'width' => 60, ),
+					'LinkName' => Array ('data_block' => 'grid_link_name_td', 'filter_block' => 'grid_like_filter', 'first_chars' => 30, 'width' => 180, ),
 					'LinkUrl' => Array ('title' => 'la_col_LinkUrl', 'data_block' => 'grid_url_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-					'LinkValidationStatus' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 87, ),
+					'LinkValidationStatus' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 87, ),
 					'ValidationCode' => Array ('title' => 'la_col_ValidationCode', 'filter_block' => 'grid_options_filter', 'width' => 155, ),
 					'ValidationTime' => Array ('title' => 'la_col_ValidatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-					'LinkCreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+					'LinkCreatedOn' => Array ('title' => 'column:la_fld_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
 				),
 			),
 		),
Index: branches/5.1.x/units/listing_types/listing_types_config.php
===================================================================
diff -u -N -r14253 -r14535
--- branches/5.1.x/units/listing_types/listing_types_config.php	(.../listing_types_config.php)	(revision 14253)
+++ branches/5.1.x/units/listing_types/listing_types_config.php	(.../listing_types_config.php)	(revision 14535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listing_types_config.php 14253 2011-03-16 21:29:15Z alex $
+* @version	$Id: listing_types_config.php 14535 2011-09-18 14:14:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -152,9 +152,9 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'ListingTypeId' => Array ( 'title' => 'la_col_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
-								'Name' => Array ( 'title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 250),
-								'Duration' => Array ( 'title' => 'la_col_Duration' , 'data_block' => 'duration_td', 'filter_block' => 'grid_like_filter', 'width' => 100),
+								'ListingTypeId' => Array ( 'title' => 'column:la_fld_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+								'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 250),
+								'Duration' => Array ('data_block' => 'duration_td', 'filter_block' => 'grid_like_filter', 'width' => 100),
 																		),
 
 																),
Index: branches/5.1.x/install/english.lang
===================================================================
diff -u -N -r14253 -r14535
--- branches/5.1.x/install/english.lang	(.../english.lang)	(revision 14253)
+++ branches/5.1.x/install/english.lang	(.../english.lang)	(revision 14535)
@@ -1,15 +1,9 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
 	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
 		<PHRASES>
 			<PHRASE Label="la_ActionsUponExpire" Module="In-Link" Type="1">QWN0aW9ucyBVcG9uIEV4cGlyYXRpb24=</PHRASE>
 			<PHRASE Label="la_ActionsUponPurchase" Module="In-Link" Type="1">QWN0aW9ucyBVcG9uIFB1cmNoYXNl</PHRASE>
 			<PHRASE Label="la_col_DupeCount" Module="In-Link" Type="1">RHVwbGljYXRlcw==</PHRASE>
-			<PHRASE Label="la_col_ExpiresOn" Module="In-Link" Type="1">RXhwaXJlcyBPbg==</PHRASE>
-			<PHRASE Label="la_col_LinkName" Module="In-Link" Type="1">TGluaw==</PHRASE>
-			<PHRASE Label="la_col_LinkOwner" Module="In-Link" Type="1">T3duZXI=</PHRASE>
-			<PHRASE Label="la_col_ListingTypeName" Module="In-Link" Type="1">TGlzdGluZyBUeXBl</PHRASE>
-			<PHRASE Label="la_col_PendingRenewal" Module="In-Link" Type="1">UGVuZGluZyBSZW5ld2Fs</PHRASE>
-			<PHRASE Label="la_col_PurchasedOn" Module="In-Link" Type="1">RW5hYmxlZCBPbg==</PHRASE>
 			<PHRASE Label="la_col_ValidatedOn" Module="In-Link" Type="1">VmFsaWRhdGVkIE9u</PHRASE>
 			<PHRASE Label="la_col_ValidationCode" Module="In-Link" Type="1">VmFsaWRhdGlvbiBDb2Rl</PHRASE>
 			<PHRASE Label="la_config_EnableLinkContactForm" Module="In-Link" Type="1">RW5hYmxlIExpbmsgQ29udGFjdCBGb3Jtcw==</PHRASE>
@@ -19,28 +13,26 @@
 			<PHRASE Label="la_fld_AdditionalSection" Module="In-Link" Type="1">QWRkaXRpb25hbCBTZWN0aW9u</PHRASE>
 			<PHRASE Label="la_fld_cust_l_ItemTemplate" Module="In-Link" Type="1">TGluayBJdGVtIFRlbXBsYXRl</PHRASE>
 			<PHRASE Label="la_fld_EnableBuying" Module="In-Link" Type="1">RW5hYmxlIFB1cmNoYXNpbmc=</PHRASE>
-			<PHRASE Label="la_fld_ExpiresOn" Module="In-Link" Type="1">RXhwaXJhdGlvbiBEYXRl</PHRASE>
+			<PHRASE Label="la_fld_ExpiresOn" Module="In-Link" Type="1" Column="RXhwaXJlcyBPbg==">RXhwaXJhdGlvbiBEYXRl</PHRASE>
 			<PHRASE Label="la_fld_LinkAddress" Module="In-Link" Type="1">QWRkcmVzcw==</PHRASE>
 			<PHRASE Label="la_fld_LinkCity" Module="In-Link" Type="1">Q2l0eQ==</PHRASE>
 			<PHRASE Label="la_fld_LinkCountry" Module="In-Link" Type="1">Q291bnRyeQ==</PHRASE>
 			<PHRASE Label="la_fld_LinkEnableGoogleMaps" Module="In-Link" Type="1">RW5hYmxlIEdvb2dsZSBNYXBz</PHRASE>
 			<PHRASE Label="la_fld_LinkGoogleMapsAPIKey" Module="In-Link" Type="1">R29vZ2xlIE1hcHMgQVBJIEtleQ==</PHRASE>
-			<PHRASE Label="la_fld_LinkName" Module="In-Link" Type="1">TGluayBOYW1l</PHRASE>
-			<PHRASE Label="la_fld_LinkOwner" Module="In-Link" Type="1">TGluayBPd25lcg==</PHRASE>
+			<PHRASE Label="la_fld_LinkName" Module="In-Link" Type="1" Column="TGluaw==">TGluayBOYW1l</PHRASE>
+			<PHRASE Label="la_fld_LinkOwner" Module="In-Link" Type="1" Column="T3duZXI=">TGluayBPd25lcg==</PHRASE>
 			<PHRASE Label="la_fld_LinkPhone" Module="In-Link" Type="1">UGhvbmU=</PHRASE>
 			<PHRASE Label="la_fld_LinkState" Module="In-Link" Type="1">U3RhdGU=</PHRASE>
 			<PHRASE Label="la_fld_LinkStatus" Module="In-Link" Type="1">TGluayBTdGF0dXM=</PHRASE>
 			<PHRASE Label="la_fld_LinkZipCode" Module="In-Link" Type="1">WmlwIGNvZGU=</PHRASE>
 			<PHRASE Label="la_fld_Link_MaxHotNumber" Module="In-Link" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIGxpbmtz</PHRASE>
 			<PHRASE Label="la_fld_Link_MinPopRating" Module="In-Link" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgbGluayBQT1A=</PHRASE>
 			<PHRASE Label="la_fld_Link_MinPopVotes" Module="In-Link" Type="1">TWluaW11bSBudW1iZXIgb2Ygdm90ZXMgdG8gY29uc2lkZXIgbGluayBQT1A=</PHRASE>
-			<PHRASE Label="la_fld_ListingId" Module="In-Link" Type="1">SUQ=</PHRASE>
-			<PHRASE Label="la_fld_ListingType" Module="In-Link" Type="1">TGlzdGluZyBUeXBl</PHRASE>
 			<PHRASE Label="la_fld_ListingTypeDescription" Module="In-Link" Type="1">RGVzY3JpcHRpb24=</PHRASE>
 			<PHRASE Label="la_fld_ListingTypeId" Module="In-Link" Type="1">SUQ=</PHRASE>
-			<PHRASE Label="la_fld_ListingTypeName" Module="In-Link" Type="1">TmFtZQ==</PHRASE>
-			<PHRASE Label="la_fld_PendingRenewal" Module="In-Link" Type="1">UGVuZGluZyBSZW5ld2Fs</PHRASE>
-			<PHRASE Label="la_fld_PurchasedOn" Module="In-Link" Type="1">UHVyY2hhc2UgRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_fld_ListingTypeName" Module="In-Link" Type="1" Column="TGlzdGluZyBUeXBl">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_PendingRenewal" Module="In-Link" Type="1" Column="UGVuZGluZyBSZW5ld2Fs">UGVuZGluZyBSZW5ld2Fs</PHRASE>
+			<PHRASE Label="la_fld_PurchasedOn" Module="In-Link" Type="1" Column="RW5hYmxlZCBPbg==">UHVyY2hhc2UgRGF0ZQ==</PHRASE>
 			<PHRASE Label="la_fld_ReciprocalLinkFound" Module="In-Link" Type="1">UmVjaXByb2NhbCBMaW5rIFN0YXR1cw==</PHRASE>
 			<PHRASE Label="la_fld_Recurring" Module="In-Link" Type="1">UmVjdXJyaW5n</PHRASE>
 			<PHRASE Label="la_fld_RenewalReminder" Module="In-Link" Type="1">UmVuZXdhbCBSZW1pbmRlcg==</PHRASE>
Index: branches/5.1.x/install/upgrades.php
===================================================================
diff -u -N -r14482 -r14535
--- branches/5.1.x/install/upgrades.php	(.../upgrades.php)	(revision 14482)
+++ branches/5.1.x/install/upgrades.php	(.../upgrades.php)	(revision 14535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 14482 2011-08-13 05:36:40Z alex $
+* @version	$Id: upgrades.php 14535 2011-09-18 14:14:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -54,6 +54,7 @@
 				'5.1.3-B1' => Array ('Core' => '5.1.3-B2'),
 				'5.1.3-RC1' => Array ('Core' => '5.1.3-RC1'),
 				'5.1.3-RC2' => Array ('Core' => '5.1.3-RC2'),
+				'5.1.3' => Array ('Core' => '5.1.3'),
 			);
 		}