Index: branches/5.2.x/units/affiliates/affiliates_tag_processor.php
===================================================================
diff -u -N -r14656 -r14677
--- branches/5.2.x/units/affiliates/affiliates_tag_processor.php	(.../affiliates_tag_processor.php)	(revision 14656)
+++ branches/5.2.x/units/affiliates/affiliates_tag_processor.php	(.../affiliates_tag_processor.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_tag_processor.php 14656 2011-10-11 16:16:08Z alex $
+* @version	$Id: affiliates_tag_processor.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -107,26 +107,28 @@
 		function UserLink($params)
 		{
 			$object =& $this->getObject($params);
+			/* @var $object kDBItem */
+
 			$user_id = $object->GetDBField('PortalUserId');
 
-			if ($user_id) {
-				$url_params =  Array (
-					'm_opener' => 'd',
-					'u_mode' => 't',
-					'u_event' => 'OnEdit',
-					'u_id' => $user_id,
-					'pass' => 'all,u'
-				);
-
-				return $this->Application->HREF($params['edit_template'], '', $url_params);
+			if ( !$user_id ) {
+				return '';
 			}
+
+			$url_params =  Array (
+				'm_opener' => 'd',
+				'u_mode' => 't',
+				'u_event' => 'OnEdit',
+				'u_id' => $user_id,
+				'pass' => 'all,u'
+			);
+
+			return $this->Application->HREF($params['edit_template'], '', $url_params);
 		}
 
 		function CurrentUserAffiliateField($params)
 		{
-			$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, array_merge($params, Array('skip_autoload' => true)) );
-			$object->Load( Array('PortalUserId'=>$this->Application->RecallVar('user_id')) );
-			return $object->GetField($this->SelectParam($params, 'field,name'));
+			return $this->Application->ProcessParsedTag($this->Prefix . '.user', 'Field', $params);
 		}
 
 		function IsAffiliateOrRegisterAsAffiliateAllowed($params)