Index: branches/5.3.x/units/affiliates/affiliates_event_handler.php
===================================================================
diff -u -N -r15925 -r15936
--- branches/5.3.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 15925)
+++ branches/5.3.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 15936)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_event_handler.php 15925 2013-07-30 10:02:36Z alex $
+* @version	$Id: affiliates_event_handler.php 15936 2013-08-14 09:32:43Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -349,8 +349,9 @@
 			$object->SetDBField('PortalUserId', $user->GetID());
 
 			if ( $object->Create() ) {
-				$this->Application->emailUser('AFFILIATE.REGISTER', $user->GetID());
-				$this->Application->emailAdmin('AFFILIATE.REGISTER');
+				$send_params = $object->getEmailParams();
+				$this->Application->emailUser('AFFILIATE.REGISTER', $user->GetID(), $send_params);
+				$this->Application->emailAdmin('AFFILIATE.REGISTER', null, $send_params);
 			}
 		}
 
@@ -407,8 +408,9 @@
 				$object = $event->getObject();
 				/* @var $object kDBItem */
 
-				$this->Application->emailUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'));
-				$this->Application->emailAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED');
+				$send_params = $object->getEmailParams();
+				$this->Application->emailUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'), $send_params);
+				$this->Application->emailAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED', null, $send_params);
 
 				$next_template = $this->Application->GetVar('next_template');
 
@@ -451,8 +453,9 @@
 
 			foreach ($new_ids as $payment_id) {
 				$payment_object->Load($payment_id);
-				$this->Application->emailUser('AFFILIATE.PAYMENT', $payment_object->GetDBField('PortalUserId'));
-				$this->Application->emailAdmin('AFFILIATE.PAYMENT');
+				$send_params = $payment_object->getEmailParams();
+				$this->Application->emailUser('AFFILIATE.PAYMENT', $payment_object->GetDBField('PortalUserId'), $send_params);
+				$this->Application->emailAdmin('AFFILIATE.PAYMENT', null, $send_params);
 			}
 
 			$object = $event->getObject();
@@ -470,8 +473,9 @@
 			$old_status = $this->Conn->GetOne($sql);
 
 			if ( $old_status == 2 && $object->GetDBField('Status') == 1 ) {
-				$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
-				$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED');
+				$send_params = $object->getEmailParams();
+				$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'), $send_params);
+				$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED', null, $send_params);
 			}
 		}
 
@@ -619,16 +623,19 @@
 					}
 
 					if ( $object->Update() ) {
+						$send_params = $object->getEmailParams();
+
 						switch ($event->Name) {
 							case 'OnMassApprove':
-								$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
-								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED');
+								$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'), $send_params);
+								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED', null, $send_params);
 								break;
 							case 'OnMassDecline':
-								$this->Application->emailUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'));
-								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.DENIED');
+								$this->Application->emailUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'), $send_params);
+								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.DENIED', null, $send_params);
 								break;
 						}
+
 						$event->status = kEvent::erSUCCESS;
 						$event->SetRedirectParam('opener', 's'); //stay!
 					}