Index: trunk/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r4358 -r4380
--- trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 4358)
+++ trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 4380)
@@ -1636,7 +1636,10 @@
 			$field_options = Array('type' => 'string', 'not_null' => 1, 'default' => '');
 			foreach ($custom_fields as $custom_id => $custom_name) {
 				$calculated_fields['cust_'.$custom_name] = 'cust.'.$ml_formatter->LangFieldName('cust_'.$custom_id);
-				$virtual_fields['cust_'.$custom_name] = $field_options;
+				if (!isset($virtual_fields['cust_'.$custom_name])) {
+					$virtual_fields['cust_'.$custom_name] = Array();
+				}
+				$virtual_fields['cust_'.$custom_name] = array_merge_recursive2($field_options, $virtual_fields['cust_'.$custom_name]);
 			}
 			$this->Application->setUnitOption($main_prefix, 'CustomFields', $custom_fields);
 			$this->Application->setUnitOption($main_prefix.'.', 'CalculatedFields', $calculated_fields);