Index: branches/5.3.x/core/kernel/event_manager.php
===================================================================
diff -u -N -r15677 -r15698
--- branches/5.3.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 15677)
+++ branches/5.3.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: event_manager.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: event_manager.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -290,7 +290,7 @@
 		if ( $event_mapping === false ) {
 			$this->Conn->nextQueryCachable = true;
 			$sql = 'SELECT TemplateId, TemplateName, Type, BindToSystemEvent
-					FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
+					FROM ' . $this->Application->getUnitConfig('email-template')->getTableName() . '
 					WHERE BindToSystemEvent <> ""';
 			$event_mapping = $this->Conn->Query($sql, 'BindToSystemEvent');
 
@@ -336,7 +336,7 @@
 
 			if ( $object->isLoaded() ) {
 				$item_id = $object->GetID();
-				$parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
+				$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 
 				if ( $parent_prefix ) {
 					$parent_item_id = $object->getParentId($parent_prefix);