Index: branches/5.3.x/units/order_items/order_items_event_handler.php
===================================================================
diff -u -r15492 -r15695
--- branches/5.3.x/units/order_items/order_items_event_handler.php	(.../order_items_event_handler.php)	(revision 15492)
+++ branches/5.3.x/units/order_items/order_items_event_handler.php	(.../order_items_event_handler.php)	(revision 15695)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_event_handler.php 15149 2012-03-04 09:05:03Z alex $
+* @version	$Id: order_items_event_handler.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 @@
 					$product_object->Load($product_id);
 
 					$sql = 'SELECT COUNT(*)
-							FROM ' . $this->Application->getUnitOption('po', 'TableName') . '
+							FROM ' . $this->Application->getUnitConfig('po')->getTableName() . '
 							WHERE (Required = 1) AND (ProductId = ' . $product_id . ')';
 
 					if ( $this->Conn->GetOne($sql) ) {
@@ -278,13 +278,11 @@
 		{
 			parent::OnAfterClone($event);
 
-			$id = $event->getEventParam('id');
-			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
-			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+			$config = $event->getUnitConfig();
 
-			$sql = 'UPDATE ' . $table . '
+			$sql = 'UPDATE ' . $config->getTableName() . '
 					SET QuantityReserved = NULL
-					WHERE ' . $id_field . ' = ' . $id;
+					WHERE ' . $config->getIDField() . ' = ' . $event->getEventParam('id');
 			$this->Conn->Query($sql);
 		}