Index: trunk/core/kernel/utility/temp_handler.php
===================================================================
diff -u -r3654 -r3703
--- trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 3654)
+++ trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 3703)
@@ -277,9 +277,11 @@
 					if (!getArrayValue($sub_table, 'AutoDelete')) continue;
 					$sub_TableName = ($object->mode == 't') ? $this->GetTempName($sub_table['TableName']) : $sub_table['TableName'];
 
-					$foreign_key_field = is_array($sub_table['ForeignKey']) ? $sub_table['ForeignKey'][$master['Prefix']] : $sub_table['ForeignKey'];
-					$parent_key_field = is_array($sub_table['ParentTableKey']) ? $sub_table['ParentTableKey'][$master['Prefix']] : $sub_table['ParentTableKey'];
+					$foreign_key_field = is_array($sub_table['ForeignKey']) ? getArrayValue($sub_table, 'ForeignKey', $master['Prefix']) : $sub_table['ForeignKey'];
+					$parent_key_field = is_array($sub_table['ParentTableKey']) ? getArrayValue($sub_table, 'ParentTableKey', $master['Prefix']) : $sub_table['ParentTableKey'];
 
+					if (!$foreign_key_field || !$parent_key_field) continue;
+
 					$query = 'SELECT '.$sub_table['IdField'].' FROM '.$sub_TableName.'
 										WHERE '.$foreign_key_field.' = '.$original_values[$parent_key_field];
 
@@ -343,6 +345,7 @@
 			foreach ($master['SubTables'] as $sub_table) {
 
 				$parent_key = is_array($sub_table['ParentTableKey']) ? $sub_table['ParentTableKey'][$master['Prefix']] : $sub_table['ParentTableKey'];
+				if (!$parent_key) continue;
 
 				if ( $ids != '' && $parent_key != $key_field ) {
 					$query = 'SELECT '.$parent_key.' FROM '.$master['TableName'].'
@@ -527,10 +530,11 @@
 
 	function UpdateForeignKeys($master, $live_id, $temp_id) {
 		foreach ($master['SubTables'] as $sub_table) {
+			$foreign_key_field =  is_array($sub_table['ForeignKey']) ? getArrayValue($sub_table, 'ForeignKey', $master['Prefix']) : $sub_table['ForeignKey'];
+			if (!$foreign_key_field) return;
+
 			list ($live_foreign_key, $temp_foreign_key) = $this->GetForeignKeys($master, $sub_table, $live_id, $temp_id);
 
-			$foreign_key_field =  is_array($sub_table['ForeignKey']) ? $sub_table['ForeignKey'][$master['Prefix']] : $sub_table['ForeignKey'];
-
 			//Update ForeignKey in sub TEMP table
 			if ($live_foreign_key != $temp_foreign_key) {
 				$query = 'UPDATE '.$this->GetTempName($sub_table['TableName']).'
@@ -550,8 +554,9 @@
 			// delete records from live table by foreign key, so that records deleted from temp table
 			// get deleted from live
 			if (count($current_ids) > 0  && !in_array($table_sig, $this->CopiedTables) ) {
+				$foreign_key_field =  is_array($sub_table['ForeignKey']) ? getArrayValue($sub_table, 'ForeignKey', $master['Prefix']) : $sub_table['ForeignKey'];
+				if (!$foreign_key_field) continue;
 				$foreign_keys = $this->GetForeignKeys($master, $sub_table, $current_ids);
-				$foreign_key_field =  is_array($sub_table['ForeignKey']) ? $sub_table['ForeignKey'][$master['Prefix']] : $sub_table['ForeignKey'];
 				if (count($foreign_keys) > 0) {
 					$query = 'SELECT '.$sub_table['IdField'].' FROM '.$sub_table['TableName'].'
 										WHERE '.$foreign_key_field.' IN ('.join(',', $foreign_keys).')';