Index: trunk/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -N -r6625 -r8397
--- trunk/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 6625)
+++ trunk/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 8397)
@@ -82,6 +82,10 @@
 			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+			/* @var $ml_helper kMultiLanguageHelper */
+			
+			// call main item config to clone cdata table
+			$this->Application->getUnitOption($main_prefix, 'TableName');
 			$ml_helper->deleteField($main_prefix.'-cdata', $event->getEventParam('id'));
 		}
 
@@ -113,9 +117,11 @@
 			$object =& $event->getObject();
 			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
-			$this->Application->HandleEvent( new kEvent($main_prefix.'-cdata:OnCreateCustomFields') );
-
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+			/* @var $ml_helper kMultiLanguageHelper */
+			
+			// call main item config to clone cdata table
+			$this->Application->getUnitOption($main_prefix, 'TableName');
 			$ml_helper->createFields($main_prefix.'-cdata');
 		}