Index: branches/unlabeled/unlabeled-1.26.16/core/kernel/utility/temp_handler.php
===================================================================
diff -u -r6119 -r6873
--- branches/unlabeled/unlabeled-1.26.16/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 6119)
+++ branches/unlabeled/unlabeled-1.26.16/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 6873)
@@ -43,6 +43,14 @@
 	*/
 	var $Conn;
 
+	
+	/**
+	 * Window ID of current window
+	 *
+	 * @var mixed
+	 */
+	var $WindowID = '';
+	
 	function kTempTablesHandler()
 	{
 		parent::kBase();
@@ -70,12 +78,12 @@
 	 */
 	function GetTempName($table)
 	{
-		return $this->Application->GetTempName($table);
+		return $this->Application->GetTempName($table, $this->WindowID);
 	}
 
 	function GetTempTablePrefix()
 	{
-		return $this->Application->GetTempTablePrefix();
+		return $this->Application->GetTempTablePrefix($this->WindowID);
 	}
 
 	/**
@@ -116,6 +124,8 @@
 
 	function BuildTables($prefix, $ids)
 	{
+		$this->WindowID = $this->Application->GetVar('m_wid');
+		
 		$this->TableIdCounter = 0;
 		$tables = Array(
 				'TableName'	=>	$this->Application->getUnitOption($prefix, 'TableName'),