Index: branches/5.2.x/admin_templates/articles/articles_edit.tpl
===================================================================
diff -u -N -r16582 -r16678
--- branches/5.2.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 16582)
+++ branches/5.2.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 16678)
@@ -104,6 +104,12 @@
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadCatStory" title="la_fld_LeadCatStory" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Priority" title="la_fld_Priority" size="4" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="CreatedOn" title="la_fld_CreatedOn" display_original="1"/>
+
+			<inp2:m_if check="n_Field" name="ModifiedById" db="db">
+				<inp2:m_RenderElement name="inp_label" prefix="n" field="Modified"/>
+				<inp2:m_RenderElement name="inp_label" prefix="n" field="ModifiedBy"/>
+			</inp2:m_if>
+
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="StartDate" title="la_fld_StartDate" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="EndOn" title="la_fld_EndOn" display_original="1"/>
 
Index: branches/5.2.x/units/articles/articles_config.php
===================================================================
diff -u -N -r16582 -r16678
--- branches/5.2.x/units/articles/articles_config.php	(.../articles_config.php)	(revision 16582)
+++ branches/5.2.x/units/articles/articles_config.php	(.../articles_config.php)	(revision 16678)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_config.php 16582 2017-07-18 11:31:30Z alex $
+* @version	$Id: articles_config.php 16678 2021-03-12 16:30:57Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -335,6 +335,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',
@@ -362,6 +363,7 @@
 				LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
 				{PERM_JOIN}
 				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$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 	),
 
@@ -379,6 +381,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$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId'
 	),
 
@@ -443,7 +446,7 @@
 		'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
 		'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
 		'Archived' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 2 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
-		'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'Modified' => array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
 		'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
 		'OrgId' => Array ('type' => 'int', 'default' => null),
 		'MetaKeywords' => Array ('type' => 'string', 'default' => null),
@@ -455,6 +458,7 @@
 		'MoreCategories' => Array ('type' => 'string', 'default' => ''),
 
 		'UserName' => Array ('type' => 'string', 'default' => ''),
+		'ModifiedBy' => array('type' => 'string', 'default' => ''),
 		'CategoryId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
 
 		'cust_RssOriginalURL' => Array ('type' => 'string', 'default' => ''),
@@ -538,6 +542,8 @@
 				'LeadCatStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
 				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
 				'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'Modified' => array('filter_block' => 'grid_date_range_filter', 'width' => 140),
+				'ModifiedBy' => array('filter_block' => 'grid_like_filter', 'width' => 100),
 				'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
 				'EndOn' => Array ('data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
 			),
@@ -562,6 +568,8 @@
 				'LeadCatStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
 				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
 				'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'Modified' => array('filter_block' => 'grid_date_range_filter', 'width' => 140),
+				'ModifiedBy' => array('filter_block' => 'grid_like_filter', 'width' => 100),
 				'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
 				'EndOn' => Array ('data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
 			),