Index: branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php
===================================================================
diff -u -r5858 -r5862
--- branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 5858)
+++ branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 5862)
@@ -1739,6 +1739,8 @@
 				$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
 				$cloned_ids = $temp_handler->CloneItems($event->Prefix, $event->Special, Array($object->GetID()), null, null, null, true);
 				
+				// 1.1. clone category items here too
+				
 				// 2. put cloned id to OrgId field of item being cloned
 				$sql = 'UPDATE '.$object->TableName.'
 						SET OrgId = '.$object->GetID().'
Index: branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php
===================================================================
diff -u -r5858 -r5862
--- branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 5858)
+++ branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 5862)
@@ -1739,6 +1739,8 @@
 				$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
 				$cloned_ids = $temp_handler->CloneItems($event->Prefix, $event->Special, Array($object->GetID()), null, null, null, true);
 				
+				// 1.1. clone category items here too
+				
 				// 2. put cloned id to OrgId field of item being cloned
 				$sql = 'UPDATE '.$object->TableName.'
 						SET OrgId = '.$object->GetID().'
Index: branches/unlabeled/unlabeled-1.25.2/core/kernel/utility/temp_handler.php
===================================================================
diff -u -r5858 -r5862
--- branches/unlabeled/unlabeled-1.25.2/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 5858)
+++ branches/unlabeled/unlabeled-1.25.2/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 5862)
@@ -505,7 +505,7 @@
 					$this->saveID($master['Prefix'], '', $insert_id);
 					$this->RaiseEvent( 'OnAfterCopyToLive', $master['Prefix'], '', Array($insert_id), null, array('temp_id' => $id) );
 
-					$this->UpdateForeignKeys($master, $insert_id, $id);
+					$this->UpdateForeignKeys($master, $insert_id, $id_to_copy);
 
 					//delete already copied record from master temp table
 					$query = 'DELETE FROM '.$this->GetTempName($master['TableName']).'