Index: branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_tp.php
===================================================================
diff -u -N -r15677 -r15698
--- branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_tp.php	(.../system_event_subscription_tp.php)	(revision 15677)
+++ branches/5.3.x/core/units/system_event_subscriptions/system_event_subscription_tp.php	(.../system_event_subscription_tp.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: system_event_subscription_tp.php 15677 2013-01-17 18:52:50Z alex $
+ * @version	$Id: system_event_subscription_tp.php 15698 2013-02-19 11:33:17Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -129,7 +129,7 @@
 	{
 		foreach ($this->_subscriptions as $subscription) {
 			$prefix = $this->_getPrefix();
-			$parent_prefix = $this->Application->getUnitOption($prefix, 'ParentPrefix');
+			$parent_prefix = $this->Application->getUnitConfig($prefix)->getParentPrefix();
 
 			$this->_addIdToPrefix($prefix, 'ItemId');
 			$this->_addIdToPrefix($parent_prefix, 'ParentItemId');
@@ -168,10 +168,11 @@
 	protected function _queryItemTitles()
 	{
 		foreach ($this->_prefixToIdsMap as $prefix => $ids) {
-			$id_field = $this->Application->getUnitOption($prefix, 'IDField');
+			$config = $this->Application->getUnitConfig($prefix);
+			$id_field = $config->getIDField();
 
 			$sql = 'SELECT ' . $this->_getTitleField($prefix) . ', ' . $id_field . '
-					FROM ' . $this->Application->getUnitOption($prefix, 'TableName') . '
+					FROM ' . $config->getTableName() . '
 					WHERE ' . $id_field . ' IN (' . implode(',', $ids) . ')';
 			$this->_itemTitles[$prefix] = $this->Conn->GetCol($sql, $id_field);
 		}
@@ -239,7 +240,8 @@
 	protected function _getTitleField($prefix)
 	{
 		$lang_prefix = '';
-		$title_field = $this->Application->getUnitOption($prefix, 'TitleField');
+		$config = $this->Application->getUnitConfig($prefix);
+		$title_field = $config->getTitleField();
 
 		if ( preg_match('/^(l[\d]+_)(.*)/', $title_field, $regs) ) {
 			// object was initialized and we have lang prefix in unit config
@@ -248,9 +250,9 @@
 		}
 		else {
 			// object wasn't initialized -> check other way OR not ml title field
-			$fields = $this->Application->getUnitOption($prefix, 'Fields');
+			$field_options = $config->getFieldByName($title_field);
 
-			if ( isset($fields[$title_field]['formatter']) && $fields[$title_field]['formatter'] == 'kMultiLanguage' ) {
+			if ( isset($field_options['formatter']) && $field_options['formatter'] == 'kMultiLanguage' ) {
 				$lang_prefix = 'l' . $this->Application->GetVar('m_lang') . '_';
 			}
 		}