Index: branches/5.2.x/units/topics/topics_config.php
===================================================================
diff -u -N -r14088 -r14098
--- branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 14088)
+++ branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 14098)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_config.php 14088 2010-11-26 22:11:10Z alex $
+* @version	$Id: topics_config.php 14098 2010-12-28 17:48:25Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -244,10 +244,10 @@
 
 					'FilterMenu'		=>	Array (
 						'Groups' => Array (
-							Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),
-							Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),
-							Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),
-							Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => kDBList::HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => kDBList::HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => kDBList::HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => kDBList::WHERE_FILTER),
 						),
 						'Filters' => Array (
 							'show_new'	=>	Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
Index: branches/5.2.x/units/private_message_body/private_message_body_eh.php
===================================================================
diff -u -N -r13839 -r14098
--- branches/5.2.x/units/private_message_body/private_message_body_eh.php	(.../private_message_body_eh.php)	(revision 13839)
+++ branches/5.2.x/units/private_message_body/private_message_body_eh.php	(.../private_message_body_eh.php)	(revision 14098)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_message_body_eh.php 12740 2009-10-20 19:39:07Z alex $
+* @version	$Id: private_message_body_eh.php 14098 2010-12-28 17:48:25Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -50,7 +50,7 @@
 			/* @var $object kDBItem */
 
 			if ($object->GetDBField('ReferenceCount') > 0) {
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 			}
 		}
 	}
\ No newline at end of file
Index: branches/5.2.x/units/private_messages/private_message_eh.php
===================================================================
diff -u -N -r13839 -r14098
--- branches/5.2.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 13839)
+++ branches/5.2.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 14098)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_message_eh.php 12740 2009-10-20 19:39:07Z alex $
+* @version	$Id: private_message_eh.php 14098 2010-12-28 17:48:25Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -146,7 +146,7 @@
 		{
 			parent::OnCreate($event);
 
-			if ($event->status == erSUCCESS && !$this->Application->isAdmin) {
+			if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
 				$event->SetRedirectParam('opener', 's');
 				$event->redirect = $this->Application->GetVar('next_template');
 			}
@@ -165,7 +165,7 @@
 			$user_id = $this->Application->RecallVar('user_id');
 			$owner_field = ($object->GetDBField('FolderId') == PM_FOLDER_INBOX) ? 'ToId' : 'FromId';
 			if ($object->GetDBField($owner_field) != $user_id) {
-	    		$event->status = erFAIL;
+	    		$event->status = kEvent::erFAIL;
 	    	}
 		}
 
Index: branches/5.2.x/units/helpers/post_helper.php
===================================================================
diff -u -N -r13839 -r14098
--- branches/5.2.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 13839)
+++ branches/5.2.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 14098)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_helper.php 12740 2009-10-20 19:39:07Z alex $
+* @version	$Id: post_helper.php 14098 2010-12-28 17:48:25Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -407,7 +407,7 @@
 				$bbcode_mask = trim($this->Application->ParseBlock($block_params));
 			}
 
-			$input_string = trim( str_replace('\"','"', unhtmlentities($input_string)) );
+			$input_string = trim( str_replace('\"','"', kUtil::unhtmlentities($input_string)) );
 			$input_string = $this->highlightCode($input_string);
 			$input_string = preg_replace("/\r<br \/>/s", "\r", $input_string); // undo nl2br added in highlighting
 			$input_string = str_replace('#BB_CODE#', $input_string, $bbcode_mask);
Index: branches/5.2.x/install/upgrades.php
===================================================================
diff -u -N -r14088 -r14098
--- branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14088)
+++ branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14098)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 14088 2010-11-26 22:11:10Z alex $
+* @version	$Id: upgrades.php 14098 2010-12-28 17:48:25Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -21,9 +21,9 @@
 	 */
 	class InBulletinUpgrades extends kUpgradeHelper {
 
-		function InBulletinUpgrades()
+		public function __construct()
 		{
-			parent::kHelper();
+			parent::__construct();
 
 			$this->dependencies = Array (
 				'4.3.9' => Array ('Core' => '4.3.9'),
Index: branches/5.2.x/units/topics/topics_event_handler.php
===================================================================
diff -u -N -r13839 -r14098
--- branches/5.2.x/units/topics/topics_event_handler.php	(.../topics_event_handler.php)	(revision 13839)
+++ branches/5.2.x/units/topics/topics_event_handler.php	(.../topics_event_handler.php)	(revision 14098)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_event_handler.php 13548 2010-05-11 19:50:00Z alex $
+* @version	$Id: topics_event_handler.php 14098 2010-12-28 17:48:25Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -29,15 +29,15 @@
 				/* @var $object kCatDBItem */
 
 				if (!$object->isLoaded()) {
-					$event->status = erPERM_FAIL;
+					$event->status = kEvent::erPERM_FAIL;
 					return false;
 				}
 
 				$category_id = $object->GetDBField('CategoryId');
 				$perm_status = $this->Application->CheckPermission('TOPIC.LOCK', 0, $category_id);
 
 				if (!$perm_status) {
-					$event->status = erPERM_FAIL;
+					$event->status = kEvent::erPERM_FAIL;
 				}
 
 				return $perm_status;
Index: branches/5.2.x/units/posts/post_eh.php
===================================================================
diff -u -N -r13839 -r14098
--- branches/5.2.x/units/posts/post_eh.php	(.../post_eh.php)	(revision 13839)
+++ branches/5.2.x/units/posts/post_eh.php	(.../post_eh.php)	(revision 14098)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_eh.php 12740 2009-10-20 19:39:07Z alex $
+* @version	$Id: post_eh.php 14098 2010-12-28 17:48:25Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -116,7 +116,7 @@
 
 			$perm_status = $this->checkPostPermission($event, 'TOPIC.REPLY.MODIFY|TOPIC.REPLY.OWNER.MODIFY');
 			if (!$perm_status) {
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 				return ;
 			}
 
@@ -156,7 +156,7 @@
 
 			$perm_status = $this->checkPostPermission($event, 'TOPIC.REPLY.OWNER.DELETE|TOPIC.REPLY.DELETE');
 			if (!$perm_status) {
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 			}
 		}
 
@@ -271,7 +271,7 @@
 		{
 			parent::OnCreate($event);
 
-			if ($event->status == erSUCCESS && !$this->Application->isAdmin) {
+			if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
 				$event->SetRedirectParam('opener', 's');
 				$event->redirect = $this->Application->GetVar('next_template');
 			}
@@ -286,7 +286,7 @@
 		{
 			parent::OnUpdate($event);
 
-			if ($event->status == erSUCCESS && !$this->Application->isAdmin) {
+			if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
 				$event->SetRedirectParam('opener', 's');
 				$event->redirect = $this->Application->GetVar('next_template');
 				$event->SetRedirectParam('pass', 'm,bb');
@@ -367,7 +367,7 @@
 		{
 			parent::OnDelete($event);
 
-			if ($event->status == erSUCCESS && !$this->Application->isAdmin) {
+			if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
 				$parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
 				$event->SetRedirectParam('pass', 'm,'.$parent_prefix);
 			}
Index: branches/5.2.x/units/poll_comments/poll_comment_eh.php
===================================================================
diff -u -N -r13839 -r14098
--- branches/5.2.x/units/poll_comments/poll_comment_eh.php	(.../poll_comment_eh.php)	(revision 13839)
+++ branches/5.2.x/units/poll_comments/poll_comment_eh.php	(.../poll_comment_eh.php)	(revision 14098)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_comment_eh.php 13577 2010-05-19 07:24:12Z alex $
+* @version	$Id: poll_comment_eh.php 14098 2010-12-28 17:48:25Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -92,7 +92,7 @@
 				$spam_helper->InitHelper($poll_id, 'PollComment', 0); // ResourceId used for SpamControl only
 
 				if ($spam_helper->InSpamControl()) {
-					$event->status = erFAIL;
+					$event->status = kEvent::erFAIL;
 					$object->SetError('CommentText', 'too_frequent', 'lu_error_AlreadyCommented');
 					return ;
 				}
@@ -119,7 +119,7 @@
 				return;
 			}
 
-			if ($event->status == erSUCCESS) {
+			if ($event->status == kEvent::erSUCCESS) {
 				$event->setRedirectParam('opener', 's');
 				$event->setRedirectParam('pass', 'm,poll');
 				$event->redirect = $this->Application->GetVar('success_template');