Index: branches/5.3.x/units/orders/orders_item.php
===================================================================
diff -u -N -r15492 -r15695
--- branches/5.3.x/units/orders/orders_item.php	(.../orders_item.php)	(revision 15492)
+++ branches/5.3.x/units/orders/orders_item.php	(.../orders_item.php)	(revision 15695)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_item.php 15141 2012-03-04 08:08:18Z alex $
+* @version	$Id: orders_item.php 15695 2013-02-19 11:30:36Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -58,7 +58,7 @@
 				}
 			}
 
-			$pt_table = $this->Application->getUnitOption('pt', 'TableName');
+			$pt_table = $this->Application->getUnitConfig('pt')->getTableName();
 
 			$sql = 'SELECT GatewayId
 					FROM %s
@@ -71,8 +71,8 @@
 			$ret = $this->Conn->GetRow(sprintf($sql, TABLE_PREFIX . 'Gateways', $gw_id));
 
 			// get Gateway parameters based on payment type
-			$gwf_table = $this->Application->getUnitOption('gwf', 'TableName');
-			$gwfv_table = $this->Application->getUnitOption('gwfv', 'TableName');
+			$gwf_table = $this->Application->getUnitConfig('gwf')->getTableName();
+			$gwfv_table = $this->Application->getUnitConfig('gwfv')->getTableName();
 
 			$sql = 'SELECT gwfv.Value, gwf.SystemFieldName
 					FROM %s gwf
@@ -130,8 +130,8 @@
 
 			$tax = false;
 			$sql = 'SELECT tx.*
-				FROM '.$this->Application->getUnitOption('tax', 'TableName').' tx
-				LEFT JOIN '.$this->Application->getUnitOption('taxdst', 'TableName').' txd ON tx.TaxZoneId = txd.TaxZoneId
+				FROM '.$this->Application->getUnitConfig('tax')->getTableName().' tx
+				LEFT JOIN '.$this->Application->getUnitConfig('taxdst')->getTableName().' txd ON tx.TaxZoneId = txd.TaxZoneId
 				WHERE
 					(	txd.StdDestId IN ('.$shipping_country_id.','.$shipping_state_id.')
 						AND
@@ -250,7 +250,7 @@
 		function requireCreditCard()
 		{
 			$sql = 'SELECT RequireCCFields
-					FROM ' . $this->Application->getUnitOption('pt', 'TableName') . ' pt
+					FROM ' . $this->Application->getUnitConfig('pt')->getTableName() . ' pt
 					LEFT JOIN '.TABLE_PREFIX.'Gateways gw ON gw.GatewayId = pt.GatewayId
 					WHERE pt.PaymentTypeId = ' . $this->GetDBField('PaymentType');