Index: branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php
===================================================================
diff -u -N -r16323 -r16389
--- branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php	(.../email_templates_email-template.php)	(revision 16323)
+++ branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php	(.../email_templates_email-template.php)	(revision 16389)
@@ -64,5 +64,5 @@
 	// hide columns in grids
 	$hide_columns = Array (
 //		'Default'	=>	Array ('TemplateId', 'Description', 'TemplateName', 'Module', 'Type', 'Enabled', 'LastChanged'),
-		'Emails'    =>  Array (/*'EventId', 'Event', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly', 'LastChanged',*/ 'TranslationInSync', 'TranslateFromLanguage'),
+		'Emails'	=>	Array (/*'TemplateId', 'TemplateName', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly', 'LastChanged',*/ 'TranslationInSync', 'TranslateFromLanguage'),
 	);
Index: branches/5.3.x/core/units/logs/system_logs/system_logs_config.php
===================================================================
diff -u -N -r15659 -r16389
--- branches/5.3.x/core/units/logs/system_logs/system_logs_config.php	(.../system_logs_config.php)	(revision 15659)
+++ branches/5.3.x/core/units/logs/system_logs/system_logs_config.php	(.../system_logs_config.php)	(revision 16389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: system_logs_config.php 15659 2013-01-02 17:25:37Z alex $
+* @version	$Id: system_logs_config.php 16389 2016-11-06 21:03:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -86,7 +86,7 @@
 
 	'CalculatedFields' => Array (
 		'' => Array (
-			'Username' => 'CASE %1$s.LogUserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(CONCAT(u.FirstName, u.LastName) <> "", CONCAT(u.FirstName, " ", u.LastName), u.Username) END',
+			'Username' => 'CASE %1$s.LogUserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(CONCAT(u.FirstName, u.LastName) <> "", CONCAT(u.FirstName, " ", u.LastName), IF(u.Username = "", u.Email, u.Username)) END',
 		),
 	),
 
@@ -202,4 +202,4 @@
 			),
 		),
 	),
-);
\ No newline at end of file
+);
Index: branches/5.3.x/core/units/skins/skins_config.php
===================================================================
diff -u -N -r15677 -r16389
--- branches/5.3.x/core/units/skins/skins_config.php	(.../skins_config.php)	(revision 15677)
+++ branches/5.3.x/core/units/skins/skins_config.php	(.../skins_config.php)	(revision 16389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: skins_config.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: skins_config.php 16389 2016-11-06 21:03:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -113,7 +113,7 @@
 		'Logo' => Array (
 			'type' => 'string', 'formatter' => 'kUploadFormatter',
 			'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
-			'file_types'=>'*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description'=>'!la_hint_ImageFiles!',
+			'file_types' => '*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!',
 			'upload_dir' => WRITEBALE_BASE . '/user_files/', // relative to project's home
 			'thumb_format' => 'resize:100x100',
 			'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
@@ -123,7 +123,7 @@
 		'LogoBottom' => Array (
 			'type' => 'string', 'formatter' => 'kUploadFormatter',
 			'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
-			'file_types'=>'*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description'=>'!la_hint_ImageFiles!',
+			'file_types' => '*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!',
 			'upload_dir' => WRITEBALE_BASE . '/user_files/', // relative to project's home
 			'thumb_format' => 'resize:100x100',
 			'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
@@ -133,7 +133,7 @@
 		'LogoLogin' => Array (
 			'type' => 'string', 'formatter' => 'kUploadFormatter',
 			'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
-			'file_types'=>'*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description'=>'!la_hint_ImageFiles!',
+			'file_types' => '*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!',
 			'upload_dir' => WRITEBALE_BASE . '/user_files/', // relative to project's home
 			'thumb_format' => 'resize:100x100',
 			'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
@@ -178,4 +178,4 @@
 			),
 		),
 	),
-);
\ No newline at end of file
+);
Index: branches/5.3.x/core/units/visits/visits_config.php
===================================================================
diff -u -N -r15677 -r16389
--- branches/5.3.x/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 15677)
+++ branches/5.3.x/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 16389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_config.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: visits_config.php 16389 2016-11-06 21:03:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -123,7 +123,7 @@
 		'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'default' => NULL),
 		'Referer' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
 		'IPAddress' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-		'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = af.PortalUserId WHERE %s','left_key_field' => 'AffiliateId','left_title_field' => 'IF(u.Email = "", u.Username, u.Email)','not_null'=>1,'default'=>0),
+		'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = af.PortalUserId WHERE %s', 'left_key_field' => 'AffiliateId', 'left_title_field' => 'IF(u.Email = "", u.Username, u.Email)', 'not_null'=>1,'default'=>0),
 		'PortalUserId' => Array ('type' => 'int', 'not_null' => '1', 'default' => USER_GUEST),
 	),
 
@@ -163,4 +163,4 @@
 			),
 		),
 	),
-);
\ No newline at end of file
+);
Index: branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -N -r15677 -r16389
--- branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 15677)
+++ branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 16389)
@@ -73,7 +73,7 @@
 		<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
 
 		<inp2:m_if check="m_Get" name="simple_mode">
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50"/>
 		<inp2:m_else/>
 			<tr class="subsectiontitle">
 				<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
@@ -94,4 +94,4 @@
 	</table>
 </div>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.3.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r15902 -r16389
--- branches/5.3.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 15902)
+++ branches/5.3.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 16389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 15902 2013-07-12 15:37:15Z alex $
+* @version	$Id: categories_config.php 16389 2016-11-06 21:03:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -328,7 +328,7 @@
 		'MetaKeywords' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
 		'CachedDescendantCatsQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'CachedNavbar' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
-		'CreatedById' => 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),
+		'CreatedById' => 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),
 		'ResourceId' => Array ('type' => 'int', 'default' => null),
 		'ParentPath' => Array ('type' => 'string', 'default' => null),
 		'TreeLeft' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -340,7 +340,7 @@
 		'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
 		'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),
 		'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
-		'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),
+		'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),
 		'CachedTemplate' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 		'CachedTemplateHash' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0),
 
@@ -540,4 +540,4 @@
 		'DefaultSorting1Dir' => 'Category_Sortorder',
 		'DefaultSorting2Dir' => 'Category_Sortorder2',
 	),
-);
\ No newline at end of file
+);
Index: branches/5.3.x/core/units/email_templates/email_templates_config.php
===================================================================
diff -u -N -r16323 -r16389
--- branches/5.3.x/core/units/email_templates/email_templates_config.php	(.../email_templates_config.php)	(revision 16323)
+++ branches/5.3.x/core/units/email_templates/email_templates_config.php	(.../email_templates_config.php)	(revision 16389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_templates_config.php 16323 2016-01-23 19:28:31Z alex $
+* @version	$Id: email_templates_config.php 16389 2016-11-06 21:03:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -76,14 +76,14 @@
 		'PermSection' => Array ('main' => 'in-portal:configemail'),
 
 		'Sections' => Array (
-			'in-portal:configemail'	=>	Array (
-				'parent'		=>	'in-portal:site',
-				'icon'			=>	'email_templates',
-				'label'			=>	'la_title_EmailTemplates',
-				'url'			=>	Array ('t' => 'languages/email_template_list', 'pass' => 'm'),
-				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
-				'priority'		=>	5,
-				'type'			=>	stTREE,
+			'in-portal:configemail' => Array (
+				'parent' => 'in-portal:site',
+				'icon' => 'email_templates',
+				'label' => 'la_title_EmailTemplates',
+				'url' => Array ('t' => 'languages/email_template_list', 'pass' => 'm'),
+				'permissions' => Array ('view', 'add', 'edit', 'delete'),
+				'priority' => 5,
+				'type' => stTREE,
 			),
 		),
 
@@ -122,9 +122,9 @@
 
 		'Fields' => Array (
 			'TemplateId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-            'TemplateName' => Array ('type' => 'string', 'not_null' => 1, 'unique' => Array ('Type'), 'required' => 1, 'default' => ''),
+			'TemplateName' => Array ('type' => 'string', 'not_null' => 1, 'unique' => Array ('Type'), 'required' => 1, 'default' => ''),
 			'Headers' => Array ('type' => 'string', 'default' => NULL),
-            'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
+			'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
 
 			'AllowChangingSender' => Array (
 				'type' => 'int',
@@ -163,7 +163,7 @@
 			),
 			'Recipients' => Array ('type' => 'string', 'default' => NULL),
 
-            'Subject' => Array (
+			'Subject' => Array (
 				'type' => 'string',
 				'formatter' => 'kMultiLanguage', 'db_type' => 'text',
 				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
@@ -190,34 +190,34 @@
 				'not_null' => 1, 'default' => 0
 			),
 
-            'Enabled' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-            	'not_null' => 1, 'default' => 1
-            ),
+			'Enabled' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'not_null' => 1, 'default' => 1
+			),
 
-            'FrontEndOnly' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-            	'not_null' => 1, 'default' => 0
-            ),
+			'FrontEndOnly' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'not_null' => 1, 'default' => 0
+			),
 
-            'Module' => Array (
-            	'type' => 'string',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (),
-            	'not_null' => 1, 'required' => 1, 'default' => 'Core'
-            ),
+			'Module' => Array (
+				'type' => 'string',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (),
+				'not_null' => 1, 'required' => 1, 'default' => 'Core'
+			),
 
-            'Description' => Array ('type' => 'string', 'default' => NULL),
+			'Description' => Array ('type' => 'string', 'default' => NULL),
 
-            'Type' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
-            	'not_null' => 1, 'unique' => Array ('TemplateName'), 'required' => 1, 'default' => 0
-            ),
+			'Type' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
+				'not_null' => 1, 'unique' => Array ('TemplateName'), 'required' => 1, 'default' => 0
+			),
 			'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 			'BindToSystemEvent' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-    	),
+		),
 
 		'VirtualFields' => Array (
 			'RecipientType' => Array (
@@ -265,7 +265,7 @@
 			),
 		),
 
-		'Grids'	=> Array (
+		'Grids' => Array (
 			// used on "Email Events" tab in language editing in "Regional" section
 			'Default' => Array (
 				'Icons' => Array (
@@ -274,13 +274,13 @@
 					1 => 'icon16_item.png',
 				),
 				'Fields' => Array (
-					'TemplateId' 		=>	Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-					'Description'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'TemplateName'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Module'		=>	Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
-					'Type'			=>	Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
-					'Enabled'		=>	Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-					'LastChanged'	=>	Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
+					'TemplateId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+					'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'TemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'Module' => Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
+					'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+					'Enabled' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+					'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
 				),
 			),
 
Index: branches/5.3.x/core/units/structure/structure_config.php
===================================================================
diff -u -N -r15902 -r16389
--- branches/5.3.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 15902)
+++ branches/5.3.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 16389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: structure_config.php 15902 2013-07-12 15:37:15Z alex $
+* @version	$Id: structure_config.php 16389 2016-11-06 21:03:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -142,7 +142,7 @@
 		'MetaKeywords' => Array ('type' => 'string', 'default' => null),
 		'CachedDescendantCatsQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'CachedNavbar' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
-		'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', '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),
+		'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', '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),
 		'ResourceId' => Array ('type' => 'int', 'default' => null),
 		'ParentPath' => Array ('type' => 'string', 'default' => null),
 		'TreeLeft' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -154,7 +154,7 @@
 		'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
 		'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),
 		'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
-		'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', '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),
+		'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', '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),
 		'CachedTemplate' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 		'CachedTemplateHash' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0),
 
@@ -274,4 +274,4 @@
 		'DefaultSorting1Dir' => 'Category_Sortorder',
 		'DefaultSorting2Dir' => 'Category_Sortorder2',
 	),
-);
\ No newline at end of file
+);
Index: branches/5.3.x/core/kernel/utility/logger.php
===================================================================
diff -u -N -r16334 -r16389
--- branches/5.3.x/core/kernel/utility/logger.php	(.../logger.php)	(revision 16334)
+++ branches/5.3.x/core/kernel/utility/logger.php	(.../logger.php)	(revision 16389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: logger.php 16334 2016-01-23 20:16:51Z alex $
+* @version	$Id: logger.php 16389 2016-11-06 21:03:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -320,6 +320,7 @@
 		if ( $this->Application->InitDone ) {
 			$this->_logRecord['LogUserId'] = $this->Application->RecallVar('user_id');
 			$this->_logRecord['LogSessionKey'] = $this->Application->GetSID();
+			$this->_logRecord['IpAddress'] = $this->Application->getClientIp();
 		}
 
 		return $this;