Index: branches/5.3.x/core/kernel/event_manager.php
===================================================================
diff -u -N -r15483 -r15677
--- branches/5.3.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 15483)
+++ branches/5.3.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: event_manager.php 15433 2012-07-12 14:51:05Z alex $
+* @version	$Id: event_manager.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -284,34 +284,34 @@
 			return;
 		}
 
-		$cache_key = 'email_to_event_mapping[%EmaileventsSerial%]';
+		$cache_key = 'email_to_event_mapping[%EmailTemplateSerial%]';
 		$event_mapping = $this->Application->getCache($cache_key);
 
 		if ( $event_mapping === false ) {
 			$this->Conn->nextQueryCachable = true;
-			$sql = 'SELECT EventId, Event, Type, BindToSystemEvent
-					FROM ' . TABLE_PREFIX . 'EmailEvents
+			$sql = 'SELECT TemplateId, TemplateName, Type, BindToSystemEvent
+					FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
 					WHERE BindToSystemEvent <> ""';
 			$event_mapping = $this->Conn->Query($sql, 'BindToSystemEvent');
 
 			$this->Application->setCache($cache_key, $event_mapping);
 		}
 
-		$email_event = Array ();
+		$email_template = Array ();
 
 		if ( isset($event_mapping[(string)$event]) ) {
-			$email_event = $event_mapping[(string)$event];
+			$email_template = $event_mapping[(string)$event];
 		}
 		elseif ( isset($event_mapping[$event->Prefix . '.*:' . $event->Name]) ) {
-			$email_event = $event_mapping[$event->Prefix . '.*:' . $event->Name];
+			$email_template = $event_mapping[$event->Prefix . '.*:' . $event->Name];
 		}
 
-		if ( !$email_event ) {
+		if ( !$email_template ) {
 			return;
 		}
 
 		$where_clause = Array ();
-		$where_clause['EmailEventId'] = 'EmailEventId = ' . $email_event['EventId'];
+		$where_clause['EmailTemplateId'] = 'EmailTemplateId = ' . $email_template['TemplateId'];
 
 		try {
 			$category_ids = Array ();
@@ -350,7 +350,7 @@
 		$where_clause['ParentItemId'] = $this->_getSubscriberFilter('ParentItemId', $parent_item_id);
 
 		$event_params = Array (
-			'EmailEventId' => $email_event['EventId'],
+			'EmailTemplateId' => $email_template['TemplateId'],
 			'CategoryIds' => $category_ids,
 			'ItemId' => $item_id,
 			'ParentId' => $parent_item_id,
@@ -374,12 +374,12 @@
 			'PrefixSpecial' => $event->getPrefixSpecial(),
 		);
 
-		$send_method = $email_event['Type'] == EmailEvent::EVENT_TYPE_FRONTEND ? 'EmailEventUser' : 'EmailEventAdmin';
+		$send_method = $email_template['Type'] == EmailTemplate::TEMPLATE_TYPE_FRONTEND ? 'emailUser' : 'emailAdmin';
 
 		foreach ($subscribers as $subscriber_info) {
 			$send_params['to_name'] = $subscriber_info['SubscriberEmail'];
 			$send_params['to_email'] = $subscriber_info['SubscriberEmail'];
-			$this->Application->$send_method($email_event['Event'], $subscriber_info['UserId'], $send_params);
+			$this->Application->$send_method($email_template['TemplateName'], $subscriber_info['UserId'], $send_params);
 		}
 	}