Index: branches/5.3.x/units/helpers/post_helper.php
===================================================================
diff -u -N -r15490 -r15670
--- branches/5.3.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 15490)
+++ branches/5.3.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 15670)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_helper.php 15311 2012-04-20 12:29:29Z alex $
+* @version	$Id: post_helper.php 15670 2013-01-17 08:35:40Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -158,7 +158,7 @@
 		function parsePostBody($post_body, $post_options, $sub_blocks)
 		{
 			// 1. escape all html sequences
-			$post_body = htmlspecialchars($post_body, ENT_NOQUOTES); // don't touch quotes in bbcode attribute values
+			$post_body = htmlspecialchars($post_body, ENT_NOQUOTES, CHARSET); // don't touch quotes in bbcode attribute values
 
 			// 2. replace censored words
 			$post_body = $this->CensorText($post_body);
@@ -441,15 +441,15 @@
 					$category_id = isset($arguments[0]) ? $arguments[0] : $this->Application->GetVar('m_cat_id');
 
 					$fields_hash = Array (
-						'EmailEventId' => $manager->getEmailEventId('TOPIC.ADD.SUB'),
+						'EmailTemplateId' => $manager->getEmailTemplateId('TOPIC.ADD.SUB'),
 						'UserId' => $user_id,
 						'CategoryId' => $category_id,
 					);
 					break;
 
 				case 'TopicPosts':
 					$fields_hash = Array (
-						'EmailEventId' => $manager->getEmailEventId('POST.ADD.SUB'),
+						'EmailTemplateId' => $manager->getEmailTemplateId('POST.ADD.SUB'),
 						'UserId' => $user_id,
 						'ParentItemId' => $arguments[0],
 					);