Index: branches/5.3.x/units/affiliate_plans/affiliate_plans_event_handler.php
===================================================================
diff -u -N -r15671 -r15695
--- branches/5.3.x/units/affiliate_plans/affiliate_plans_event_handler.php	(.../affiliate_plans_event_handler.php)	(revision 15671)
+++ branches/5.3.x/units/affiliate_plans/affiliate_plans_event_handler.php	(.../affiliate_plans_event_handler.php)	(revision 15695)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_plans_event_handler.php 15671 2013-01-17 11:39:41Z alex $
+* @version	$Id: affiliate_plans_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
@@ -85,18 +85,21 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$live_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$config = $event->getUnitConfig();
+
+			$live_table = $config->getTableName();
 			$plans_count = $this->Conn->GetOne('SELECT COUNT(*) FROM ' . $live_table);
+
 			if ( !$plans_count ) {
 				$object->SetDBField('IsPrimary', 1);
 			}
 
 			if ( $object->GetDBField('IsPrimary') && $object->Validate() ) {
-				$sql = 'UPDATE ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+				$sql = 'UPDATE ' . $config->getTableName() . '
 						SET IsPrimary = 0';
 				$this->Conn->Query($sql);
 
-				$object->SetDBField($object->getStatusField(), 1);
+				$object->SetDBField($config->getStatusField(true), 1);
 			}
 		}
 
@@ -111,10 +114,11 @@
 		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+				$config = $event->getUnitConfig();
 				$ids = $event->getEventParam('ids');
 
-				$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
-						FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+				$sql = 'SELECT ' . $config->getIDField() . '
+						FROM ' . $config->getTableName() . '
 						WHERE IsPrimary = 1';
 				$primary_id = $this->Conn->GetOne($sql);