Index: branches/5.2.x/install/upgrades.php
===================================================================
diff -u -r14091 -r14101
--- branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14091)
+++ branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14101)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 14091 2010-11-26 22:28:21Z alex $
+* @version	$Id: upgrades.php 14101 2010-12-28 18:10:35Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -22,9 +22,9 @@
 	 */
 	class InNewsUpgrades extends kUpgradeHelper {
 
-		function InNewsUpgrades()
+		public function __construct()
 		{
-			parent::kHelper();
+			parent::__construct();
 
 			$this->dependencies = Array (
 				'4.3.9' => Array ('Core' => '4.3.9'),
Index: branches/5.2.x/units/articles/articles_config.php
===================================================================
diff -u -r14091 -r14101
--- branches/5.2.x/units/articles/articles_config.php	(.../articles_config.php)	(revision 14091)
+++ branches/5.2.x/units/articles/articles_config.php	(.../articles_config.php)	(revision 14101)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_config.php 14091 2010-11-26 22:28:21Z alex $
+* @version	$Id: articles_config.php 14101 2010-12-28 18:10:35Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -286,10 +286,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/articles/articles_event_handler.php
===================================================================
diff -u -r14091 -r14101
--- branches/5.2.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 14091)
+++ branches/5.2.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 14101)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_event_handler.php 14091 2010-11-26 22:28:21Z alex $
+* @version	$Id: articles_event_handler.php 14101 2010-12-28 18:10:35Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -184,7 +184,7 @@
 			$xml_helper =& $this->Application->recallObject('kXMLHelper');
 			/* @var $xml_helper kXMLHelper */
 
-			$root_node =& $xml_helper->Parse($xml_data, XML_WITH_TEXT_NODES);
+			$root_node =& $xml_helper->Parse($xml_data, kXMLHelper::XML_WITH_TEXT_NODES);
 
 			$feed_types = Array (
 				'rss_2.0' => 'channel', 'atom' => 'feed',
@@ -325,7 +325,7 @@
 					break;
 
 				case 'html':
-					$data = unhtmlentities( $node->GetXML(true) ); // $node->firstChild->Data // $node->Data
+					$data = kUtil::unhtmlentities( $node->GetXML(true) ); // $node->firstChild->Data // $node->Data
 					break;
 
 				default:
@@ -488,7 +488,7 @@
 											'cust_RssLastExpired'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
 									);
 			$virtual_fields = $this->Application->getUnitOption('c', 'VirtualFields');
-			$virtual_fields = array_merge_recursive2($virtual_fields, $new_virtual_fields);
+			$virtual_fields = kUtil::array_merge_recursive($virtual_fields, $new_virtual_fields);
 			$this->Application->setUnitOption('c', 'VirtualFields', $virtual_fields);
 		}
 
@@ -501,7 +501,7 @@
 		{
 			parent::OnPreCreate($event);
 
-			if ($event->status == erSUCCESS) {
+			if ($event->status == kEvent::erSUCCESS) {
 				$object =& $event->getObject();
 
 				$archive_days = $this->Application->ConfigValue('News_Archive');