Index: branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -N -r14888 -r14989
--- branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 14888)
+++ branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 14989)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_event_handler.php 14888 2011-12-20 10:44:35Z alex $
+* @version	$Id: custom_fields_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
@@ -23,7 +23,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
 			$sql = 'SELECT Prefix
 					FROM '.TABLE_PREFIX.'ItemTypes
@@ -44,32 +44,34 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
+			parent::SetCustomQuery($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
 			$item_type = $this->Application->GetVar('cf_type');
-			if (!$item_type) {
+			if ( !$item_type ) {
 				$prefix = $event->getEventParam('SourcePrefix');
 				$item_type = $this->Application->getUnitOption($prefix, 'ItemType');
 			}
 
-			if ($event->Special == 'general') {
+			if ( $event->Special == 'general' ) {
 				$object->addFilter('generaltab_filter', '%1$s.OnGeneralTab = 1');
 			}
 
-			if ($item_type) {
+			if ( $item_type ) {
 				$hidden_fields = $this->Conn->qstrArray($this->_getHiddenFields($event));
 
-				if ($hidden_fields) {
+				if ( $hidden_fields ) {
 					$object->addFilter('hidden_filter', '%1$s.FieldName NOT IN (' . implode(',', $hidden_fields) . ')');
 				}
 
-				$object->addFilter('itemtype_filter', '%1$s.Type = '.$item_type);
+				$object->addFilter('itemtype_filter', '%1$s.Type = ' . $item_type);
 			}
 
-			if (!($this->Application->isDebugMode() && $this->Application->isAdminUser)) {
+			if ( !($this->Application->isDebugMode() && $this->Application->isAdminUser) ) {
 				$object->addFilter('user_filter', '%1$s.IsSystem = 0');
 			}
 		}