Index: branches/5.1.x/core/units/custom_data/custom_data_event_handler.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 12657)
+++ branches/5.1.x/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_data_event_handler.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: custom_data_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!');
@@ -55,7 +55,7 @@
 				return false;
 			}
 
-			if (!$custom_fields || (defined('IS_INSTALL') && IS_INSTALL)) {
+			if (!$custom_fields || (defined('IS_INSTALL') && IS_INSTALL) || (defined('CUSTOM_FIELD_ADDED') && CUSTOM_FIELD_ADDED)) {
 				// query all custom fields at once -> saves 4 sqls queries
 				$sql = 'SELECT *
 						FROM '.TABLE_PREFIX.'CustomField';