Index: branches/5.2.x/core/units/page_revisions/page_revisions_config.php
===================================================================
diff -u -N -r15165 -r15563
--- branches/5.2.x/core/units/page_revisions/page_revisions_config.php	(.../page_revisions_config.php)	(revision 15165)
+++ branches/5.2.x/core/units/page_revisions/page_revisions_config.php	(.../page_revisions_config.php)	(revision 15563)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: page_revisions_config.php 15165 2012-03-09 10:24:24Z alex $
+* @version	$Id: page_revisions_config.php 15563 2012-10-09 16:05:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -57,7 +57,7 @@
 
 		'CalculatedFields' => Array (
 			'' => Array (
-				'CreatedBy' => 'created_by.Username',
+				'CreatedBy' => 'IF(created_by.Username = "", created_by.Email, created_by.Username)',
 				'IsLive' => 'IF(%1$s.RevisionNumber = c.LiveRevisionNumber, 1, 0)',
 			),
 		),
@@ -74,7 +74,7 @@
 			'FromRevisionId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'CreatedById' => 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', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'sample_value' => 'Guest', 'required' => 1,
+				'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, 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'sample_value' => 'Guest', 'required' => 1,
 				'default' => NULL
 			),
 			'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),