Index: branches/5.2.x/units/orders/orders_tag_processor.php
===================================================================
diff -u -N -r16361 -r16378
--- branches/5.2.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 16361)
+++ branches/5.2.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 16378)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_tag_processor.php 16361 2016-07-12 07:47:21Z alex $
+* @version	$Id: orders_tag_processor.php 16378 2016-07-25 08:49:52Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1111,10 +1111,9 @@
 			/* @var $object OrdersItem */
 
 			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
-			$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']);
 
 			return $gateway_object->getFormAction($gw_data['gw_params']);
 		}
@@ -1125,10 +1124,9 @@
 			/* @var $object OrdersItem */
 
 			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
-			$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']);
 
 			$tpl = '<input type="hidden" name="%s" value="%s" />'."\n";
 			$hidden_fields = $gateway_object->getHiddenFields($object->GetFieldValues(), $params, $gw_data['gw_params']);
@@ -1152,10 +1150,9 @@
 			/* @var $object OrdersItem */
 
 			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
-			$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']);
 
 			return $gateway_object->NeedPlaceButton($object->GetFieldValues(), $params, $gw_data['gw_params']);
 		}
@@ -1394,10 +1391,9 @@
 			$object = $this->getObject($params);
 			$gw_data = $object->getGatewayData($params['payment_type_id']);
 
-			$this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
-			$gateway_object = $this->Application->recallObject( $gw_data['ClassName'] );
+			/** @var kGWBase $gateway_object */
+			$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
 
-
 			$sql = 'SELECT oi.*
 					FROM '.TABLE_PREFIX.'OrderItems oi
 					LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId