Index: branches/5.3.x/units/topics/topics_config.php
===================================================================
diff -u -N -r15655 -r15670
--- branches/5.3.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 15655)
+++ branches/5.3.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 15670)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_config.php 15655 2013-01-02 17:24:32Z alex $
+* @version	$Id: topics_config.php 15670 2013-01-17 08:35:40Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -296,7 +296,7 @@
 
 	'CalculatedFields' => Array (
 		'' => Array (
-			'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.OwnerId = ' . USER_ROOT . ', "root", IF (%1$s.OwnerId = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
+			'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.OwnerId = ' . USER_ROOT . ', "root", IF (%1$s.OwnerId = ' . USER_GUEST . ', "Guest", "n/a")), IF(u.Username = "", u.Email, u.Username))',
 			'CategoryId' => TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
 			'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
 			'CategoryFilename' => TABLE_PREFIX.'Categories.NamedParentPath',
@@ -396,21 +396,17 @@
 			'type' => 'int',
 			'formatter' => 'kLEFTFormatter',
 			'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
-			'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users
-							WHERE `%s` = \'%s\' ',
-			'left_key_field' => 'PortalUserId',
-			'left_title_field' => 'Username',
+			'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s',
+			'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD,
 			'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
 			'sample_value' => 'Guest', 'required' => 1, '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` = \'%s\' ',
-			'left_key_field' => 'PortalUserId',
-			'left_title_field' => 'Username',
+			'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s',
+			'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD,
 			'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
 			'default' => NULL,
 		),