Index: branches/5.2.x/units/topics/topics_config.php
===================================================================
diff -u -N -r14710 -r14722
--- branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 14710)
+++ branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 14722)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_config.php 14710 2011-11-01 09:39:14Z alex $
+* @version	$Id: topics_config.php 14722 2011-11-03 08:41:10Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -289,7 +289,7 @@
 
 					'CalculatedFields' => Array (
 						'' => Array (
-							'UserName' 		=> 'IF (ISNULL(u.Login), IF (%1$s.OwnerId = ' . USER_ROOT . ', "root", IF (%1$s.OwnerId = ' . USER_GUEST . ', "Guest", "n/a")), u.Login)',
+							'UserName' 		=> 'IF (ISNULL(u.Username), IF (%1$s.OwnerId = ' . USER_ROOT . ', "root", IF (%1$s.OwnerId = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
 							'CategoryId'	=>	TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
 							'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
 							'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
@@ -388,7 +388,7 @@
 			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
 			            					WHERE `%s` = \'%s\' ',
 			            	'left_key_field' => 'PortalUserId',
-			            	'left_title_field' => 'Login',
+			            	'left_title_field' => 'Username',
 			            	'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
 			            	'sample_value' => 'Guest', 'required' => 1, 'default' => NULL,
 						),
@@ -399,7 +399,7 @@
 			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
 			            						WHERE `%s` = \'%s\' ',
 			            	'left_key_field' => 'PortalUserId',
-			            	'left_title_field' => 'Login',
+			            	'left_title_field' => 'Username',
 			            	'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
 			            	'default' => NULL,
 						),