Index: branches/5.3.x/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
diff -u -N -r15492 -r15695
--- branches/5.3.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 15492)
+++ branches/5.3.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 15695)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_option_combinations_event_handler.php 15386 2012-06-11 11:37:00Z alex $
+* @version	$Id: product_option_combinations_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
@@ -253,7 +253,7 @@
 		$object->setSelectSQL($sql);
 
 		// 2. loads if allowed
-		$auto_load = $this->Application->getUnitOption($event->Prefix, 'AutoLoad');
+		$auto_load = $event->getUnitConfig()->getAutoLoad();
 		$skip_autoload = $event->getEventParam('skip_autoload');
 
 		if ( $auto_load && !$skip_autoload ) {
@@ -370,14 +370,14 @@
 		// check if product inventory management is via options and then proceed
 
 		$id = $event->getEventParam('id');
-		$products_table = $this->Application->getUnitOption('p', 'TableName');
-		$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
-		$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+		$products_table = $this->Application->getUnitConfig('p')->getTableName();
 
+		$config = $event->getUnitConfig();;
+
 		$sql = 'SELECT p.InventoryStatus
 				FROM ' . $products_table . ' p
-				LEFT JOIN ' . $table_name . ' poc ON poc.ProductId = p.ProductId
-				WHERE poc.' . $id_field . ' = ' . $id;
+				LEFT JOIN ' . $config->getTableName() . ' poc ON poc.ProductId = p.ProductId
+				WHERE poc.' . $config->getIDField() . ' = ' . $id;
 		$inventory_status = $this->Conn->GetOne($sql);
 
 		if ( $inventory_status == ProductInventory::BY_OPTIONS ) {