Index: branches/5.3.x/units/affiliates/affiliates_config.php
===================================================================
diff -u -N -r15656 -r15671
--- branches/5.3.x/units/affiliates/affiliates_config.php	(.../affiliates_config.php)	(revision 15656)
+++ branches/5.3.x/units/affiliates/affiliates_config.php	(.../affiliates_config.php)	(revision 15671)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_config.php 15656 2013-01-02 17:24:49Z alex $
+* @version	$Id: affiliates_config.php 15671 2013-01-17 11:39:41Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -175,7 +175,7 @@
 	'CalculatedFields' => Array (
 		'' => Array (
 			'UserId' => 'u.PortalUserId',
-			'UserName' => 'IF( LENGTH(u.Username), u.Username, \'\')',
+			'UserName' => 'IF(u.Username = "", u.Email, u.Username)',
 			'PlanName' => 'ap.Name',
 		),
 	),
@@ -197,7 +197,7 @@
 
 	'Fields' => Array (
 		'AffiliateId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-		'PortalUserId' => Array ('type' => 'int',  'unique'=>Array ('PortalUserId'), 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!', 'unique' => '!la_affiliate_already_exists!'), '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, 'not_null' => 1, 'default' => 0, ),
+		'PortalUserId' => Array ('type' => 'int', 'unique' => Array (), 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!', 'unique' => '!la_affiliate_already_exists!'), '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),
 		'AffiliatePlanId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT Name, AffiliatePlanId FROM '.TABLE_PREFIX.'AffiliatePlans WHERE Enabled = 1 ORDER BY Name', 'option_key_field' => 'AffiliatePlanId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
 		'AccumulatedAmount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0.00'),
 		'AmountToPay' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0.00'),