Index: branches/5.2.x/units/links/links_config.php
===================================================================
diff -u -r16581 -r16677
--- branches/5.2.x/units/links/links_config.php	(.../links_config.php)	(revision 16581)
+++ branches/5.2.x/units/links/links_config.php	(.../links_config.php)	(revision 16677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: links_config.php 16581 2017-07-18 11:31:22Z alex $
+* @version	$Id: links_config.php 16677 2021-03-12 16:30:47Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -399,6 +399,7 @@
 	'CalculatedFields' => Array (
 		'' => Array (
 			'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), IF(u.Username = "", u.Email, u.Username))',
+			'ModifiedBy' => 'IF (ISNULL(modified.Username), IF (%1$s.ModifiedById = ' . USER_ROOT . ', "root", IF (%1$s.ModifiedById = ' . USER_GUEST . ', "Guest", "n/a")), IF(modified.Username = "", modified.Email, modified.Username))',
 			'CategoryId' => TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
 			'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
 			'CategoryFilename' => TABLE_PREFIX.'Categories.NamedParentPath',
@@ -432,6 +433,7 @@
 				LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
 				LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
 				LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.CreatedById = u.PortalUserId
+				LEFT JOIN ' . TABLE_PREFIX . 'Users modified ON %1$s.ModifiedById = modified.PortalUserId
 				LEFT JOIN '.TABLE_PREFIX.'%3$sLinkCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 	),
 
@@ -449,6 +451,7 @@
 				LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
 				LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
 				LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.CreatedById = u.PortalUserId
+				LEFT JOIN ' . TABLE_PREFIX . 'Users modified ON %1$s.ModifiedById = modified.PortalUserId
 				LEFT JOIN '.TABLE_PREFIX.'%3$sLinkCustomData cust ON %1$s.ResourceId = cust.ResourceId'
 	),
 
@@ -461,7 +464,7 @@
 		'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null),
 		'Url' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
 		'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
-		'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'Modified' => array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
 		'Expire' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
 		'Hits' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
 		'CachedRating' => Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kFormatter', 'default' => 0),
@@ -508,6 +511,7 @@
 	'VirtualFields' => Array (
 		'Relevance' => Array ('type' => 'float', 'default' => 0),
 		'UserName' => Array ('type' => 'string', 'default' => ''),
+		'ModifiedBy' => array('type' => 'string', 'default' => ''),
 		'DupeCount' => Array ('type' => 'string', 'default' => ''),
 
 		'ListingTypeId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %1$s FROM '.TABLE_PREFIX.'ListingTypes ORDER BY Name', 'option_title_field' => 'Name', 'option_key_field' => 'ListingTypeId', 'default' => 0),
@@ -591,6 +595,7 @@
 				'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, ),
+				'ModifiedBy' => array('filter_block' => 'grid_like_filter', 'width' => 100),
 				'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, ),
@@ -615,6 +620,7 @@
 				'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, ),
+				'ModifiedBy' => array('filter_block' => 'grid_like_filter', 'width' => 100),
 				'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, ),
Index: branches/5.2.x/admin_templates/links/links_edit.tpl
===================================================================
diff -u -r16581 -r16677
--- branches/5.2.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 16581)
+++ branches/5.2.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 16677)
@@ -89,6 +89,12 @@
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l" field="EditorsPick" title="la_fld_EditorsPick" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Priority" title="la_fld_Priority" size="4" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="CreatedOn" title="la_fld_CreatedOn" display_original="1"/>
+
+			<inp2:m_if check="l_Field" name="ModifiedById" db="db">
+				<inp2:m_RenderElement name="inp_label" prefix="l" field="Modified"/>
+				<inp2:m_RenderElement name="inp_label" prefix="l" field="ModifiedBy"/>
+			</inp2:m_if>
+
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="Expire" title="la_fld_Expire" size="12" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="MetaKeywords" title="la_fld_MetaKeywords" size="60"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="l" field="MetaDescription" title="la_fld_MetaDescription" cols="60" rows="5"/>