Index: branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r5962 -r6026
--- branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 5962)
+++ branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 6026)
@@ -120,8 +120,8 @@
 
 
 									// theese event do not harm, but just in case check them too :)
-									'OnCancelEdit'			=>	Array('self' => true),
-									'OnCancel'				=>	Array('self' => true),
+									'OnCancelEdit'			=>	Array('self' => true, 'subitem' => true),
+									'OnCancel'				=>	Array('self' => true, 'subitem' => true),
 
 									'OnSetSorting'			=>	Array('self' => true, 'subitem' => true),
 									'OnSetSortingDirect'	=>	Array('self' => true, 'subitem' => true),
@@ -1756,6 +1756,7 @@
 			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields', Array());
 			$field_options = Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'db_type' => 'text', 'default' => '');
 			foreach ($custom_fields as $custom_id => $custom_params) {
+				if (isset($fields['cust_'.$custom_id])) continue;
 				$fields['cust_'.$custom_id] = $field_options;
 			}
 			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);