Index: trunk/core/units/general/cat_dbitem.php
===================================================================
diff -u -r6583 -r7391
--- trunk/core/units/general/cat_dbitem.php	(.../cat_dbitem.php)	(revision 6583)
+++ trunk/core/units/general/cat_dbitem.php	(.../cat_dbitem.php)	(revision 7391)
@@ -50,7 +50,7 @@
 		$this->SetDBField('Modified', adodb_mktime() );
 
 		if ($this->mode != 't' && !$this->Application->IsAdmin()) {
-			$this->SetDBField('CreatedById', $this->Application->GetVar('u_id'));
+			$this->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 		}
 
 		if ($this->useFilenames) {
@@ -77,7 +77,7 @@
 	{
 		$this->VirtualFields['ResourceId'] = Array();
 		$this->SetDBField('Modified', adodb_mktime() );
-		$this->SetDBField('ModifiedById', $this->Application->GetVar('u_id'));
+		$this->SetDBField('ModifiedById', $this->Application->RecallVar('user_id'));
 
 		if ($this->useFilenames) {
 			$this->checkFilename();
@@ -107,7 +107,7 @@
 	{
 		$table = TABLE_PREFIX.'CategoryItems';
 		if ($this->Application->IsTempTable($this->TableName)) {
-			$table = $this->Application->GetTempName($table);
+			$table = $this->Application->GetTempName($table, 'prefix:'.$this->Prefix);
 		}
 		
 		return $table;
@@ -249,7 +249,7 @@
 	function stripDisallowed($filename)
 	{
 		$filenames_helper =& $this->Application->recallObject('FilenamesHelper');
-		$table = $this->mode == 't' ? $this->Application->GetTempName(TABLE_PREFIX.'CategoryItems') : TABLE_PREFIX.'CategoryItems';
+		$table = $this->mode == 't' ? $this->Application->GetTempName(TABLE_PREFIX.'CategoryItems', 'prefix:'.$this->Prefix) : TABLE_PREFIX.'CategoryItems';
 
 		return $filenames_helper->stripDisallowed($table, 'ItemResourceId', $this->GetDBField('ResourceId'), $filename);
 	}
@@ -309,7 +309,7 @@
 	 */
 	function assignToCategory($category_id, $is_primary = false)
 	{
-		$table = $this->mode == 't' ? $this->Application->GetTempName(TABLE_PREFIX.'CategoryItems') : TABLE_PREFIX.'CategoryItems';
+		$table = $this->mode == 't' ? $this->Application->GetTempName(TABLE_PREFIX.'CategoryItems', 'prefix:'.$this->Prefix) : TABLE_PREFIX.'CategoryItems';
 		$key_clause = '(ItemResourceId = '.$this->GetDBField('ResourceId').')';
 
 		// get all cateories, where item is in