Index: branches/5.2.x/core/units/visits/visits_config.php
===================================================================
diff -u -N -r14585 -r14726
--- branches/5.2.x/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 14585)
+++ branches/5.2.x/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 14726)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_config.php 14585 2011-09-24 12:04:17Z alex $
+* @version	$Id: visits_config.php 14726 2011-11-03 08:43:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -85,11 +85,11 @@
 
 					'CalculatedFields' => Array (
 								'' => Array (
-										'UserName'	=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), u.Login)',
+										'UserName'	=>	'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), u.Username)',
 									),
 								'incommerce' => Array (
-										'UserName'	=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), u.Login)',
-										'AffiliateUser'				=>	'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
+										'UserName'	=>	'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), u.Username)',
+										'AffiliateUser'				=>	'IF( LENGTH(au.Username),au.Username,\'!la_None!\')',
 										'AffiliatePortalUserId'		=>	'af.PortalUserId',
 										'OrderTotalAmount'			=>	'IF(ord.Status = 4, ord.SubTotal+ord.ShippingCost+ord.VAT, 0)',
 										'OrderAffiliateCommission'	=>	'IF(ord.Status = 4, ord.AffiliateCommission, 0)',
@@ -133,7 +133,7 @@
 										'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'default' => NULL),
 										'Referer' => Array ('type' => 'string','not_null' => '1','default' => ''),
             							'IPAddress' => Array ('type' => 'string','not_null' => '1','default' => ''),
-										'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Login','not_null'=>1,'default'=>0),
+										'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Username','not_null'=>1,'default'=>0),
 										'PortalUserId' => Array ('type' => 'int','not_null' => '1','default' => USER_GUEST),
 							    ),