Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r16366 -r16378
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16366)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16378)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 16366 2016-07-12 08:00:32Z alex $
+* @version	$Id: orders_event_handler.php 16378 2016-07-25 08:49:52Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -348,9 +348,8 @@
 	{
 		$gw_data = $order->getGatewayData();
 
-		$this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
-		$gateway_object = $this->Application->recallObject( $gw_data['ClassName'] );
-		/* @var $gateway_object kGWBase */
+		/** @var kGWBase $gateway_object */
+		$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
 
 		$payment_result = $gateway_object->DirectPayment($order->GetFieldValues(), $gw_data['gw_params']);
 		$sql = 'UPDATE %s SET GWResult1 = %s WHERE %s = %s';
@@ -2100,9 +2099,8 @@
 				// charge user for order in case if we user 2step charging (e.g. AUTH_ONLY + PRIOR_AUTH_CAPTURE)
 				$gw_data = $object->getGatewayData();
 
-				$this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
-				$gateway_object = $this->Application->recallObject( $gw_data['ClassName'] );
-				/* @var $gateway_object kGWBase */
+				/** @var kGWBase $gateway_object */
+				$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
 
 				$charge_result = $gateway_object->Charge($object->GetFieldValues(), $gw_data['gw_params']);
 				$sql = 'UPDATE %s SET GWResult2 = %s WHERE %s = %s';
@@ -2166,9 +2164,8 @@
 					$gw_data = $object->getGatewayData();
 
 					if ( $gw_data ) {
-						$this->Application->registerClass($gw_data['ClassName'], GW_CLASS_PATH . '/' . $gw_data['ClassFile']);
+						/** @var kGWBase $gateway_object */
 						$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
-
 						$gateway_object->OrderDeclined($object->GetFieldValues(), $gw_data['gw_params']);
 					}
 				}
@@ -2220,9 +2217,8 @@
 					// inform payment gateway that order was shipped
 					$gw_data = $object->getGatewayData();
 
-					$this->Application->registerClass($gw_data['ClassName'], GW_CLASS_PATH . '/' . $gw_data['ClassFile']);
+					/** @var kGWBase $gateway_object */
 					$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
-
 					$gateway_object->OrderShipped($object->GetFieldValues(), $gw_data['gw_params']);
 				}
 				else {