Index: trunk/core/kernel/utility/temp_handler.php
===================================================================
diff -u -N -r3863 -r4077
--- trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 3863)
+++ trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 4077)
@@ -126,12 +126,20 @@
 	{
 		$this->TableIdCounter = 0;
 		$tables = Array(
-				'TableName' => $this->Application->getUnitOption($prefix,'TableName'),
-				'IdField' => $this->Application->getUnitOption($prefix,'IDField'),
-				'IDs' => $ids,
-				'Prefix' => $prefix,
-				'TableId' => $this->TableIdCounter++,
+				'TableName'	=>	$this->Application->getUnitOption($prefix, 'TableName'),
+				'IdField'	=>	$this->Application->getUnitOption($prefix, 'IDField'),
+				'IDs'		=>	$ids,
+				'Prefix'	=>	$prefix,
+				'TableId'	=>	$this->TableIdCounter++,
 		);
+		
+		$parent_prefix = $this->Application->getUnitOption($prefix, 'ParentPrefix');
+		if ($parent_prefix) {
+			$tables['ForeignKey'] = $this->Application->getUnitOption($prefix, 'ForeignKey');
+			$tables['ParentPrefix'] = $parent_prefix;
+			$tables['ParentTableKey'] = $this->Application->getUnitOption($prefix, 'ParentTableKey');
+		}
+		
 		$this->FinalRefs[ $tables['TableName'] ] = $tables['TableId'];	// don't forget to add main table to FinalRefs too
 		
 		$SubItems = $this->Application->getUnitOption($prefix,'SubItems');