Index: branches/5.3.x/units/orders/orders_event_handler.php
===================================================================
diff -u -r15925 -r15936
--- branches/5.3.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15925)
+++ branches/5.3.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15936)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15925 2013-07-30 10:02:36Z alex $
+* @version	$Id: orders_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
@@ -382,7 +382,7 @@
 			'to_email' => $billing_email ? $billing_email : $user_email,
 		);
 
-		return $ret;
+		return $order->getEmailParams($ret);
 	}
 
 	function PrepareCoupons($event, &$order)
@@ -489,7 +489,7 @@
 			}
 
 			$this->Application->emailUser('ORDER.SUBMIT', null, $this->OrderEmailParams($order));
-			$this->Application->emailAdmin('ORDER.SUBMIT');
+			$this->Application->emailAdmin('ORDER.SUBMIT', null, $order->getEmailParams());
 		}
 
 		if ($shipping_control === false || $shipping_control == SHIPPING_CONTROL_PREAUTH ) {
@@ -2897,7 +2897,7 @@
 
 				if ($event->Special != 'recurring') { // just in case if admin uses tangible backordered products in recurring orders
 					$this->Application->emailUser('BACKORDER.ADD', null, $this->OrderEmailParams($sub_order));
-		    		$this->Application->emailAdmin('BACKORDER.ADD');
+		    		$this->Application->emailAdmin('BACKORDER.ADD', null, $sub_order->getEmailParams());
 				}
 			}
 			else {
@@ -3535,22 +3535,25 @@
 			/* @var $temp_handler kTempTablesHandler */
 
 			$cloned_order_ids = $temp_handler->CloneItems($event->Prefix, 'recurring', $order_ids);
-			$order =&  $this->Application->recallObject($event->Prefix.'.recurring', null, Array('skip_autoload' => true));
+
+			$order = $this->Application->recallObject($event->Prefix.'.recurring', null, Array('skip_autoload' => true));
+			/* @var $order OrdersItem */
+
 			foreach ($cloned_order_ids as $order_id) {
 				$order->Load($order_id);
 				$this->Application->HandleEvent($complete_event, $event->Prefix.'.recurring:OnCompleteOrder' );
 
 				if ($complete_event->status == kEvent::erSUCCESS) {
 					//send recurring ok email
 					$this->Application->emailUser('ORDER.RECURRING.PROCESSED', null, $this->OrderEmailParams($order));
-					$this->Application->emailAdmin('ORDER.RECURRING.PROCESSED');
+					$this->Application->emailAdmin('ORDER.RECURRING.PROCESSED', null, $order->getEmailParams());
 				}
 				else {
 					//send Recurring failed event
 					$order->SetDBField('Status', ORDER_STATUS_DENIED);
 					$order->Update();
 					$this->Application->emailUser('ORDER.RECURRING.DENIED', null, $this->OrderEmailParams($order));
-					$this->Application->emailAdmin('ORDER.RECURRING.DENIED');
+					$this->Application->emailAdmin('ORDER.RECURRING.DENIED', null, $order->getEmailParams());
 				}
 			}