Index: branches/5.1.x/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 12657)
+++ branches/5.1.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_event_handler.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: custom_fields_event_handler.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
@@ -30,6 +30,7 @@
 
 			$section = $this->Application->getUnitOption($main_prefix.'.custom', 'PermSection');
 			$event->setEventParam('PermSection', $section);
+
 			return parent::CheckPermission($event);
 		}
 
@@ -65,7 +66,7 @@
 				$object->addFilter('itemtype_filter', '%1$s.Type = '.$item_type);
 			}
 
-			if (!($this->Application->isDebugMode() && $this->Application->IsAdmin())) {
+			if (!($this->Application->isDebugMode() && $this->Application->isAdminUser)) {
 				$object->addFilter('user_filter', '%1$s.IsSystem = 0');
 			}
 		}
@@ -188,6 +189,7 @@
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			// call main item config to clone cdata table
+			define('CUSTOM_FIELD_ADDED', 1); // used in cdata::scanCustomFields method
 			$this->Application->getUnitOption($main_prefix, 'TableName');
 			$ml_helper->createFields($main_prefix.'-cdata');
 		}