Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15061 -r15134
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15061)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15134)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15061 2012-01-17 14:50:00Z alex $
+* @version	$Id: orders_event_handler.php 15134 2012-03-03 19:04:51Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -23,7 +23,7 @@
 	 * @return bool
 	 * @access public
 	 */
-	public function CheckPermission(kEvent &$event)
+	public function CheckPermission(kEvent $event)
 	{
 		if ( !$this->Application->isAdminUser ) {
 			if ( $event->Name == 'OnCreate' ) {
@@ -176,7 +176,7 @@
 
 	/* ======================== FRONT ONLY ======================== */
 
-	function OnQuietPreSave(&$event)
+	function OnQuietPreSave($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -191,7 +191,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSelectAddress(&$event)
+	function OnSelectAddress($event)
 	{
 		if ($this->Application->isAdminUser) {
 			return ;
@@ -252,7 +252,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUserCreate(&$event)
+	function OnUserCreate($event)
 	{
 		if( !($event->MasterEvent->status == kEvent::erSUCCESS) ) return false;
 
@@ -271,7 +271,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnUserLogin(&$event)
+	protected function OnUserLogin($event)
 	{
 		if ( ($event->MasterEvent->status != kEvent::erSUCCESS) || kUtil::constOn('IS_INSTALL') ) {
 			// login failed OR login during installation
@@ -301,7 +301,7 @@
 	 * @param kEvent $event
 	 * @return void
 	 */
-	function updateUserID($order_id, &$event)
+	function updateUserID($order_id, $event)
 	{
 		$user =& $this->Application->recallObject('u.current');
 		/* @var $user UsersItem */
@@ -380,7 +380,7 @@
 		return $email_params;
 	}
 
-	function PrepareCoupons(&$event, &$order)
+	function PrepareCoupons($event, &$order)
 	{
 		$order_items =& $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $order_items kDBList */
@@ -432,7 +432,7 @@
 	 * @param kEvent $event
 	 * @return bool
 	 */
-	function OnCompleteOrder(&$event)
+	function OnCompleteOrder($event)
 	{
 		$this->LockTables($event);
 		if ( !$this->CheckQuantites($event) ) {
@@ -526,7 +526,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function setBillingAddress(&$event)
+	function setBillingAddress($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -557,7 +557,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProceedToPreview(&$event)
+	function OnProceedToPreview($event)
 	{
 		$this->setBillingAddress($event);
 
@@ -566,13 +566,13 @@
 	}
 
 
-	function OnViewCart(&$event)
+	function OnViewCart($event)
 	{
 		$this->StoreContinueShoppingLink();
 		$event->redirect = $this->Application->GetVar('viewcart_template');
 	}
 
-	function OnContinueShopping(&$event)
+	function OnContinueShopping($event)
 	{
 		$order_helper =& $this->Application->recallObject('OrderHelper');
 		/* @var $order_helper OrderHelper */
@@ -587,7 +587,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnCheckout(&$event)
+	function OnCheckout($event)
 	{
 		$this->OnUpdateCart($event);
 		if ( !$event->getEventParam('RecalculateChangedCart') ) {
@@ -633,7 +633,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnRestoreOrder(kEvent &$event)
+	protected function OnRestoreOrder(kEvent $event)
 	{
 		if ( $this->Application->isAdmin || $this->Application->RecallVar('ord_id') ) {
 			// admin OR there is an active order -> don't restore from cookie
@@ -663,7 +663,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProceedToBilling(&$event)
+	function OnProceedToBilling($event)
 	{
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ( $items_info ) {
@@ -695,7 +695,7 @@
 	 * @param kEvent $event
 	 * @return void
 	 */
-	protected function OnCancelRecurring(&$event)
+	protected function OnCancelRecurring($event)
 	{
 		$order =& $event->getObject();
 		/* @var $order OrdersItem */
@@ -715,7 +715,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemUpdate(kEvent &$event)
+	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
@@ -737,7 +737,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnUpdate(kEvent &$event)
+	protected function OnUpdate(kEvent $event)
 	{
 		$this->setBillingAddress($event);
 
@@ -767,7 +767,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function createMissingAddresses(&$event)
+	function createMissingAddresses($event)
 	{
 		if ( !$this->Application->LoggedIn() ) {
 			return ;
@@ -822,9 +822,9 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnUpdateCart(&$event)
+	protected function OnUpdateCart($event)
 	{
-		$this->Application->HandleEvent($items_event, 'orditems:OnUpdate');
+		$this->Application->HandleEvent(new kEvent('orditems:OnUpdate'));
 
 		$event->CallSubEvent('OnRecalculateItems');
 	}
@@ -834,7 +834,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUpdateCartJSON(&$event)
+	function OnUpdateCartJSON($event)
 	{
 		if ( $this->Application->GetVar('ajax') != 'yes' ) {
 			return;
@@ -865,7 +865,7 @@
 		}
 
 		// 3. update product quantities and recalculate all discounts
-		$this->Application->HandleEvent($items_event, 'orditems:OnUpdate');
+		$this->Application->HandleEvent(new kEvent('orditems:OnUpdate'));
 		$event->CallSubEvent('OnRecalculateItems');
 
 		// 4. remove "orditems" object of kDBItem class, since getOrderInfo uses kDBList object under same prefix
@@ -885,7 +885,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnAddToCart(&$event)
+	function OnAddToCart($event)
 	{
 		$this->StoreContinueShoppingLink();
 
@@ -1000,7 +1000,7 @@
 	 * @return string
 	 * @todo Needed? Should be refactored (by Alex)
 	 */
-	function TablePrefix(kEvent &$event)
+	function TablePrefix(kEvent $event)
 	{
 		return $this->UseTempTables($event) ? $this->Application->GetTempTablePrefix('prefix:' . $event->Prefix) . TABLE_PREFIX : TABLE_PREFIX;
 	}
@@ -1015,7 +1015,7 @@
 	 * @param int $selection_mode
 	 * @return bool
 	 */
-	function CheckOptions(&$event, &$options, $product_id, $qty, $selection_mode)
+	function CheckOptions($event, &$options, $product_id, $qty, $selection_mode)
 	{
 		// 1. check for required options
 		$selection_filter = $selection_mode == 1 ? ' AND OptionType IN (1,3,6) ' : '';
@@ -1099,7 +1099,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUpdateItemOptions(&$event)
+	function OnUpdateItemOptions($event)
 	{
 		$opt_data = $this->Application->GetVar('options');
 		$options = getArrayValue($opt_data, $this->Application->GetVar('p_id'));
@@ -1167,7 +1167,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnApplyCoupon(&$event)
+	function OnApplyCoupon($event)
 	{
 		$code = $this->Application->GetVar('coupon_code');
 
@@ -1238,7 +1238,7 @@
 	 * @param kEvent $event
 	 * @deprecated
 	 */
-	function OnRemoveCoupon(&$event)
+	function OnRemoveCoupon($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -1277,7 +1277,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnAddVirtualProductToCart(&$event)
+	function OnAddVirtualProductToCart($event)
 	{
 		$l_info = $this->Application->GetVar('l');
 		if($l_info)
@@ -1315,15 +1315,15 @@
 		$event->SetRedirectParam('m_cat_id', 0); // not to pass link id
 	}
 
-	function OnRemoveFromCart(&$event)
+	function OnRemoveFromCart($event)
 	{
 		$ord_item_id = $this->Application->GetVar('orditems_id');
 		$ord_id = $this->getPassedID($event);
 		$this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'OrderItems WHERE OrderId = '.$ord_id.' AND OrderItemId = '.$ord_item_id);
 		$this->OnRecalculateItems($event);
 	}
 
-	function OnCleanupCart(&$event)
+	function OnCleanupCart($event)
 	{
 		$object =& $event->getObject();
 
@@ -1344,7 +1344,7 @@
 	 * @return int
 	 * @access public
 	 */
-	public function getPassedID(kEvent &$event)
+	public function getPassedID(kEvent $event)
 	{
 		$event->setEventParam('raise_warnings', 0);
 		$passed = parent::getPassedID($event);
@@ -1392,7 +1392,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function LoadItem(kEvent &$event)
+	protected function LoadItem(kEvent $event)
 	{
 		$id = $this->getPassedID($event);
 
@@ -1415,7 +1415,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function _createNewCart(&$event)
+	function _createNewCart($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
@@ -1509,7 +1509,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function SetStepRequiredFields(&$event)
+	function SetStepRequiredFields($event)
 	{
 		$order =& $event->getObject();
 		/* @var $order OrdersItem */
@@ -1566,7 +1566,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function CheckUser(&$event)
+	function CheckUser($event)
 	{
 		if ($this->Application->isAdminUser || defined('GW_NOTIFY')) {
 			// don't check for user in order while processing payment
@@ -1600,7 +1600,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreCreate(kEvent &$event)
+	protected function OnPreCreate(kEvent $event)
 	{
 		parent::OnPreCreate($event);
 
@@ -1622,7 +1622,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeClone(kEvent &$event)
+	protected function OnBeforeClone(kEvent $event)
 	{
 		parent::OnBeforeClone($event);
 
@@ -1643,7 +1643,7 @@
 		$object->SetDBField('GWResult2', '');
 	}
 
-	function OnReserveItems(&$event)
+	function OnReserveItems($event)
 	{
 		$order_items =& $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $order_items kDBList */
@@ -1711,7 +1711,7 @@
 		return true;
 	}
 
-	function OnOrderPrint(&$event)
+	function OnOrderPrint($event)
 	{
 		$event->SetRedirectParam('opener', 's');
 	}
@@ -1722,7 +1722,7 @@
 	 * @param kEvent $event
 	 * @access public
 	 */
-	function OnResetAddress(&$event)
+	function OnResetAddress($event)
 	{
 		$to_tab = $this->Application->GetVar('to_tab');
 		$from_tab = substr($event->Name, strlen('OnResetTo'));
@@ -1747,7 +1747,7 @@
 	 * @todo Is this called ? (by Alex)
 	 * @param kEvent $event
 	 */
-	function OnProcessSelected(&$event)
+	function OnProcessSelected($event)
 	{
 		$selected_ids = $this->Application->GetVar('selected_ids');
 		$product_ids = $selected_ids['p'];
@@ -1764,7 +1764,7 @@
 		$event->SetRedirectParam('opener', 'u');
 	}
 
-	function OnMassPlaceOrder(&$event)
+	function OnMassPlaceOrder($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$ids = $this->StoreSelectedIDs($event);
@@ -1985,7 +1985,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function MassInventoryAction(&$event)
+	function MassInventoryAction($event)
 	{
 		if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 			$event->status = kEvent::erFAIL;
@@ -2006,7 +2006,7 @@
 		}
 	}
 
-	function InventoryAction(&$event)
+	function InventoryAction($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
@@ -2240,7 +2240,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function setNextOrderNumber(&$event)
+	function setNextOrderNumber($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -2294,7 +2294,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterClone(kEvent &$event)
+	protected function OnAfterClone(kEvent $event)
 	{
 		parent::OnAfterClone($event);
 
@@ -2319,7 +2319,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(kEvent &$event)
+	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -2367,7 +2367,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -2385,7 +2385,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -2469,7 +2469,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function createAccountFromOrder(&$event)
+	protected function createAccountFromOrder($event)
 	{
 		$order =& $event->getObject();
 		/* @var $order OrdersItem */
@@ -2484,8 +2484,7 @@
 		if ( $order->GetDBField('PortalUserId') == USER_GUEST ) {
 			// will also auto-login user when created
 			$this->Application->SetVar('u_register', Array (USER_GUEST => $user_fields));
-			$user_event = new kEvent('u.register:OnCreate');
-			$this->Application->HandleEvent($user_event);
+			$this->Application->HandleEvent(new kEvent('u.register:OnCreate'));
 		}
 		else {
 			$user =& $this->Application->recallObject('u.current');
@@ -2506,7 +2505,7 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(kEvent &$event)
+	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
@@ -2558,7 +2557,7 @@
 		return $type2special[$type];
 	}
 
-	function LockTables(&$event)
+	function LockTables($event)
 	{
 		$read = Array();
 		$write_lock = '';
@@ -2582,7 +2581,7 @@
 	 * @param kEvent $event
 	 * @return bool
 	 */
-	function CheckQuantites(&$event)
+	function CheckQuantites($event)
 	{
 		if ( $this->OnRecalculateItems($event) ) { // if something has changed in the order
 			if ( $this->Application->isAdminUser ) {
@@ -2600,7 +2599,7 @@
 		return true;
 	}
 
-	function DoPlaceOrder(&$event)
+	function DoPlaceOrder($event)
 	{
 		$order =& $event->getObject();
 
@@ -2616,7 +2615,7 @@
 		return true;
 	}
 
-	function &queryOrderItems(&$event, $table_prefix)
+	function &queryOrderItems($event, $table_prefix)
 	{
 		$order =& $event->getObject();
 		$ord_id = $order->GetId();
@@ -2643,7 +2642,7 @@
 		return $items;
 	}
 
-	function ReserveItems(&$event)
+	function ReserveItems($event)
 	{
 		$table_prefix = $this->TablePrefix($event);
 		$items =& $this->queryOrderItems($event, $table_prefix);
@@ -2693,7 +2692,7 @@
 		}
 	}
 
-	function FreeItems(&$event)
+	function FreeItems($event)
 	{
 		$table_prefix = $this->TablePrefix($event);
 		$items =& $this->queryOrderItems($event, $table_prefix);
@@ -2745,7 +2744,7 @@
 	 * @param kEvent $event
 	 * @param OrdersItem $object
 	 */
-	function SplitOrder(&$event, &$object)
+	function SplitOrder($event, &$object)
 	{
 		$affiliate_event = new kEvent('affil:OnOrderApprove');
 		$affiliate_event->setEventParam('Order_PrefixSpecial', $object->getPrefixSpecial() );
@@ -3004,7 +3003,7 @@
 	 * @param kEvent $event
 	 * @param int $item_id
 	 */
-	function AddItemToOrder(&$event, $item_id, $qty = null, $package_num = null)
+	function AddItemToOrder($event, $item_id, $qty = null, $package_num = null)
 	{
 		if (!isset($qty)) {
 			$qty = 1;
@@ -3048,15 +3047,15 @@
 		$manager->setOrder($order);
 		$manager->addProduct($product, $event->getEventParam('ItemData'), $qty, $package_num);
 
-		$this->Application->HandleEvent($ord_event, 'ord:OnRecalculateItems');
+		$this->Application->HandleEvent(new kEvent('ord:OnRecalculateItems'));
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
-	function UpdateShippingTotal(&$event)
+	function UpdateShippingTotal($event)
 	{
 		if ( $this->Application->GetVar('ebay_notification') == 1 ) {
 			// TODO: get rid of this "if"
@@ -3092,7 +3091,7 @@
 	 * @param kEvent $event
 	 * @return bool Returns true if items splitting/grouping were changed
 	 */
-	function OnRecalculateItems(&$event)
+	function OnRecalculateItems($event)
 	{
 		if (is_object($event->MasterEvent) && ($event->MasterEvent->status != kEvent::erSUCCESS)) {
 			// e.g. master order update failed, don't recalculate order products
@@ -3192,7 +3191,7 @@
 		return $price_id;
 	}
 
-	function UpdateShippingOption(&$event)
+	function UpdateShippingOption($event)
 	{
 		$object =& $event->getObject();
 		$shipping_option = $object->GetDBField('ShippingOption');
@@ -3223,7 +3222,7 @@
 	 * @param kEvent $event
 	 * @return bool
 	 */
-	function UpdateShippingTypes(&$event)
+	function UpdateShippingTypes($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3305,7 +3304,7 @@
 		return true;
 	}*/
 
-	function RecalculateTax(&$event)
+	function RecalculateTax($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3317,7 +3316,7 @@
 		$object->RecalculateTax();
 	}
 
-	function RecalculateProcessingFee(&$event)
+	function RecalculateProcessingFee($event)
 	{
 		$object =& $event->getObject();
 
@@ -3331,15 +3330,15 @@
 		$this->UpdateTotals($event);
 	}
 
-	function UpdateTotals(&$event)
+	function UpdateTotals($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
 
 		$object->UpdateTotals();
 	}
 
-	/*function CalculateDiscount(&$event)
+	/*function CalculateDiscount($event)
 	{
 		$object =& $event->getObject();
 
@@ -3388,7 +3387,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnGoToOrder(&$event)
+	function OnGoToOrder($event)
 	{
 		$id = array_shift( $this->StoreSelectedIDs($event) );
 
@@ -3424,7 +3423,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnResetToPending(&$event)
+	function OnResetToPending($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
@@ -3453,7 +3452,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnLoadSelected(&$event)
+	function OnLoadSelected($event)
 	{
 		$event->setPseudoClass('_List');
 		$object =& $event->getObject( Array('selected_only' => true) );
@@ -3483,7 +3482,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnCheckRecurringOrders(&$event)
+	function OnCheckRecurringOrders($event)
 	{
 		$skip_clause = Array();
 		$ord_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
@@ -3552,7 +3551,7 @@
 	}
 
 
-	function OnGeneratePDF(&$event)
+	function OnGeneratePDF($event)
 	{
 		$this->OnLoadSelected($event);
 
@@ -3635,7 +3634,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
@@ -3700,7 +3699,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeExportBegin(kEvent &$event)
+	protected function OnBeforeExportBegin(kEvent $event)
 	{
 		parent::OnBeforeExportBegin($event);
 
@@ -3734,7 +3733,7 @@
 	 * @return Array
 	 * @access protected
 	 */
-	public function getCustomExportColumns(kEvent &$event)
+	public function getCustomExportColumns(kEvent $event)
 	{
 		$columns = parent::getCustomExportColumns($event);
 
@@ -3758,7 +3757,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(kEvent &$event)
+	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
@@ -3784,7 +3783,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeCopyToLive(kEvent &$event)
+	protected function OnBeforeCopyToLive(kEvent $event)
 	{
 		parent::OnBeforeCopyToLive($event);
 
@@ -3802,7 +3801,7 @@
 	 * @return bool
 	 * @access protected
 	 */
-	protected function checkItemStatus(kEvent &$event)
+	protected function checkItemStatus(kEvent $event)
 	{
 		if ( $this->Application->isAdminUser ) {
 			return true;
@@ -3824,7 +3823,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnApplyGiftCertificate(&$event)
+	function OnApplyGiftCertificate($event)
 	{
 		$code = $this->Application->GetVar('giftcert_code');
 
@@ -3871,7 +3870,7 @@
 	 * @param kEvent $event
 	 * @deprecated
 	 */
-	function OnRemoveGiftCertificate(&$event)
+	function OnRemoveGiftCertificate($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3887,7 +3886,7 @@
 		$object->RemoveGiftCertificate();
 	}
 
-	function RecalculateGift(&$event)
+	function RecalculateGift($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3915,7 +3914,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnDownloadLabel(&$event)
+	function OnDownloadLabel($event)
 	{
 		$event->status = kEvent::erSTOP;
 		ini_set('memory_limit', '300M');
@@ -3943,7 +3942,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemValidate(kEvent &$event)
+	protected function OnBeforeItemValidate(kEvent $event)
 	{
 		parent::OnBeforeItemValidate($event);
 
@@ -3975,7 +3974,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUpdateAjax(&$event)
+	function OnUpdateAjax($event)
 	{
 		$ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
 		/* @var $ajax_form_helper AjaxFormHelper */