Index: branches/5.3.x/core/kernel/managers/subscription_manager.php
===================================================================
diff -u -N -r15483 -r15677
--- branches/5.3.x/core/kernel/managers/subscription_manager.php	(.../subscription_manager.php)	(revision 15483)
+++ branches/5.3.x/core/kernel/managers/subscription_manager.php	(.../subscription_manager.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: subscription_manager.php 15287 2012-04-11 08:50:20Z alex $
+ * @version	$Id: subscription_manager.php 15677 2013-01-17 18:52:50Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -95,21 +95,21 @@
 	/**
 	 * Returns e-mail event id or throws an exception, when such event not found
 	 *
-	 * @param string $email_event_name
+	 * @param string $template_name
 	 * @param int $type
 	 * @return string
 	 * @throws Exception
 	 * @access public
 	 */
-	public function getEmailEventId($email_event_name, $type = EmailEvent::EVENT_TYPE_FRONTEND)
+	public function getEmailTemplateId($template_name, $type = EmailTemplate::TEMPLATE_TYPE_FRONTEND)
 	{
-		$sql = 'SELECT EventId
-				FROM ' . TABLE_PREFIX . 'EmailEvents
-				WHERE Event = ' . $this->Conn->qstr($email_event_name) . ' AND Type = ' . $type;
+		$sql = 'SELECT TemplateId
+				FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
+				WHERE TemplateName = ' . $this->Conn->qstr($template_name) . ' AND Type = ' . $type;
 		$id = $this->Conn->GetOne($sql);
 
 		if ( !$id ) {
-			throw new Exception('E-mail event "' . $email_event_name . '" not found');
+			throw new Exception('E-mail template "' . $template_name . '" not found');
 		}
 
 		return $id;