Index: branches/unlabeled/unlabeled-1.24.4/core/kernel/kbase.php
===================================================================
diff -u -r6689 -r6873
--- branches/unlabeled/unlabeled-1.24.4/core/kernel/kbase.php	(.../kbase.php)	(revision 6689)
+++ branches/unlabeled/unlabeled-1.24.4/core/kernel/kbase.php	(.../kbase.php)	(revision 6873)
@@ -235,7 +235,7 @@
 	function SwitchToTemp()
 	{
 		$this->TableName = $this->Application->getUnitOption($this->Prefix, 'TableName');
-		$this->SetTableName( $this->Application->GetTempName($this->TableName) );
+		$this->SetTableName( $this->Application->GetTempName($this->TableName, 'prefix:'.$this->Prefix) );
 		$this->mode = 't';
 	}
 
@@ -333,7 +333,7 @@
 	 */
 	function replaceModePrefix($query)
 	{
-		$live_table = substr(GetLiveName($this->TableName), strlen(TABLE_PREFIX));
+		$live_table = substr($this->Application->GetLiveName($this->TableName), strlen(TABLE_PREFIX));
 		preg_match('/'.preg_quote(TABLE_PREFIX, '/').'(.*)'.preg_quote($live_table, '/').'/', $this->TableName, $rets);
 		return str_replace('%3$s', $rets[1], $query);
 	}