Index: branches/5.2.x/core/units/category_items/category_items_event_handler.php
===================================================================
diff -u -N -r14628 -r14989
--- branches/5.2.x/core/units/category_items/category_items_event_handler.php	(.../category_items_event_handler.php)	(revision 14628)
+++ branches/5.2.x/core/units/category_items/category_items_event_handler.php	(.../category_items_event_handler.php)	(revision 14989)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: category_items_event_handler.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: category_items_event_handler.php 14989 2012-01-04 16:24:42Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -17,21 +17,24 @@
 	class CategoryItemsEventHander extends kDBEventHandler
 	{
 		/**
-		 * Setting language dependant navbar as calculated field
+		 * Setting language dependant navigation bar as calculated field
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
+			parent::SetCustomQuery($event);
+
 			$object =& $event->getObject();
+			/* @var $object kDBList */
 
 			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
 			/* @var $ml_formatter kMultiLanguage */
-			
-			$object->addCalculatedField('CategoryName', 'c.'.$ml_formatter->LangFieldName('CachedNavbar'));
+
+			$object->addCalculatedField('CategoryName', 'c.' . $ml_formatter->LangFieldName('CachedNavbar'));
 		}
 
 		/**
@@ -41,18 +44,20 @@
 		 */
 		function OnSetPrimary(&$event)
 		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
+			$object =& $event->getObject(Array ('skip_autoload' => true));
+			/* @var $object kDBItem */
+
 			$ids = $this->StoreSelectedIDs($event);
 
-			if($ids)
-			{
+			if ( $ids ) {
 				$id = array_shift($ids);
 				$table_info = $object->getLinkedInfo();
 
-				$this->Conn->Query('UPDATE '.$object->TableName.' SET PrimaryCat = 0 WHERE '.$table_info['ForeignKey'].' = '.$table_info['ParentId']);
-				$this->Conn->Query('UPDATE '.$object->TableName.' SET PrimaryCat = 1 WHERE ('.$table_info['ForeignKey'].' = '.$table_info['ParentId'].') AND (CategoryId = '.$id.')');
+				$this->Conn->Query('UPDATE ' . $object->TableName . ' SET PrimaryCat = 0 WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId']);
+				$this->Conn->Query('UPDATE ' . $object->TableName . ' SET PrimaryCat = 1 WHERE (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ') AND (CategoryId = ' . $id . ')');
 			}
-			$event->setRedirectParams(Array('opener' => 's'), true);
+
+			$event->setRedirectParams(Array ('opener' => 's'), true);
 		}
 
 		/**