Index: branches/5.2.x/units/private_messages/private_messages_config.php
===================================================================
diff -u -N -r15008 -r15559
--- branches/5.2.x/units/private_messages/private_messages_config.php	(.../private_messages_config.php)	(revision 15008)
+++ branches/5.2.x/units/private_messages/private_messages_config.php	(.../private_messages_config.php)	(revision 15559)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_messages_config.php 15008 2012-01-06 20:37:30Z alex $
+* @version	$Id: private_messages_config.php 15559 2012-10-09 16:04:08Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -76,8 +76,8 @@
 				'Body' => 'pmb.Body',
 				'Options' => 'pmb.Options',
 
-				'FromName' => 'IF (ISNULL(from_user.Username), IF (%1$s.FromId = ' . USER_ROOT . ', "root", IF (%1$s.FromId = ' . USER_GUEST . ', "Guest", "n/a")), from_user.Username)',
-				'ToName' => 'IF (ISNULL(to_user.Username), IF (%1$s.ToId = ' . USER_ROOT . ', "root", IF (%1$s.ToId = ' . USER_GUEST . ', "Guest", "n/a")), to_user.Username)',
+				'FromName' => 'IF (ISNULL(from_user.Username), IF (%1$s.FromId = ' . USER_ROOT . ', "root", IF (%1$s.FromId = ' . USER_GUEST . ', "Guest", "n/a")), IF(from_user.Username = "", from_user.Email, from_user.Username))',
+				'ToName' => 'IF (ISNULL(to_user.Username), IF (%1$s.ToId = ' . USER_ROOT . ', "root", IF (%1$s.ToId = ' . USER_GUEST . ', "Guest", "n/a")), IF(to_user.Username = "", to_user.Email, to_user.Username))',
 
 				'FromFullName' => 'TRIM(CONCAT(from_user.FirstName, " ", from_user.LastName))',
 				'ToFullName' => 'TRIM(CONCAT(to_user.FirstName, " ", to_user.LastName))',
@@ -86,8 +86,8 @@
 
 		'Fields' => Array (
 			'PmId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-		    'FromId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!lu_error_UserNotFound!'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'required' => 1, 'default' => null),
-		    'ToId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!lu_error_UserNotFound!'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'required' => 1, 'default' => null),
+		    'FromId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!lu_error_UserNotFound!'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'required' => 1, 'default' => null),
+		    'ToId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!lu_error_UserNotFound!'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'required' => 1, 'default' => null),
 		    'FolderId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_Inbox', 1 => 'lu_Sent'), 'use_phrases' => 1, 'not_null' => 1, 'default' => PM_FOLDER_SENT),
 		    'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_opt_MessageUnread', 1 => 'lu_opt_MessageViewed', 2 => 'lu_opt_MessageRead', 3 => 'lu_opt_MessageReplied', 4 => 'lu_opt_MessageSent'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 		    'PMBodyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
Index: branches/5.2.x/units/topics/topics_config.php
===================================================================
diff -u -N -r15467 -r15559
--- branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 15467)
+++ branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 15559)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_config.php 15467 2012-07-23 17:07:42Z alex $
+* @version	$Id: topics_config.php 15559 2012-10-09 16:04:08Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -290,7 +290,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',
@@ -386,21 +386,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,
 						),
Index: branches/5.2.x/units/poll_comments/poll_comments_config.php
===================================================================
diff -u -N -r15008 -r15559
--- branches/5.2.x/units/poll_comments/poll_comments_config.php	(.../poll_comments_config.php)	(revision 15008)
+++ branches/5.2.x/units/poll_comments/poll_comments_config.php	(.../poll_comments_config.php)	(revision 15559)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_comments_config.php 15008 2012-01-06 20:37:30Z alex $
+* @version	$Id: poll_comments_config.php 15559 2012-10-09 16:04:08Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -59,12 +59,15 @@
 		   	'CommentId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		    'PollId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		    'AnswerId' => Array ('type' => 'int', '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` = \'%s\'',
-		    						'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username',
-		    						'required' => 1, '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,
+				'required' => 1, 'default' => NULL
+			),
 		    'GuestName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		    'GuestEmail' => Array('type' => 'string', 'max_len' => 255, 'formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'not_null' => '1', 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!'),'required' => 0 ),
 		    'CommentBody' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL, 'required' => 1),
@@ -81,7 +84,7 @@
 
 		'CalculatedFields' => Array (
 			'' => Array (
-					'CommentedByUser' => 'IF( ISNULL(pu.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Username )',
+					'CommentedByUser' => 'IF( ISNULL(pu.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), IF(pu.Username = "", pu.Email, pu.Username))',
 			),
 		),
 
Index: branches/5.2.x/units/posts/posts_config.php
===================================================================
diff -u -N -r15008 -r15559
--- branches/5.2.x/units/posts/posts_config.php	(.../posts_config.php)	(revision 15008)
+++ branches/5.2.x/units/posts/posts_config.php	(.../posts_config.php)	(revision 15559)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: posts_config.php 15008 2012-01-06 20:37:30Z alex $
+* @version	$Id: posts_config.php 15559 2012-10-09 16:04:08Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -64,7 +64,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")), u.Username)',
+				'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))',
 
 				'AltName'		=>	'img.AltName',
 				'SameImages'	=>	'img.SameImages',
@@ -87,8 +87,8 @@
 		    'GraphicsUrl' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
 		    'CreatedOn' => 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` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', '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` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', '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),
+		    '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),
 		    'TopicId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		    'ResourceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		    'ReplyTo' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),