Index: branches/RC/core/units/custom_data/custom_data_event_handler.php
===================================================================
diff -u -N -r10459 -r10492
--- branches/RC/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 10459)
+++ branches/RC/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 10492)
@@ -41,7 +41,7 @@
 				return false;
 			}
 
-			if (!$custom_fields) {
+			if (!$custom_fields || (defined('IS_INSTALL') && IS_INSTALL)) {
 				// query all custom fields at once -> saves 4 sqls queries
 				$sql = 'SELECT *
 						FROM '.TABLE_PREFIX.'CustomField';