Index: core/install/upgrades.sql
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/install/upgrades.sql	(revision 15965)
+++ core/install/upgrades.sql	(revision )
@@ -2989,3 +2989,8 @@
 	l<%PRIMARY_LANGUAGE%>_PlainTextBody = REPLACE(l<%PRIMARY_LANGUAGE%>_PlainTextBody, '<inp2:u_Field name="Email"/>', '<inp2:Field name="Email"/>'),
 	l<%PRIMARY_LANGUAGE%>_HtmlBody = REPLACE(l<%PRIMARY_LANGUAGE%>_HtmlBody, '<inp2:u_Field name="Email"/>', '<inp2:Field name="Email"/>')
 WHERE TemplateName IN ('USER.SUBSCRIBE', 'USER.UNSUBSCRIBE');
+
+ALTER TABLE CategoryItems ADD Id int(11) NOT NULL auto_increment FIRST, ADD PRIMARY KEY (Id);
+ALTER TABLE UserGroupRelations DROP PRIMARY KEY;
+ALTER TABLE UserGroupRelations ADD Id int(11) NOT NULL auto_increment FIRST, ADD PRIMARY KEY (Id), ADD UNIQUE KEY UserGroup (PortalUserId, GroupId);
+ALTER TABLE SpamControl ADD Id int(11) NOT NULL auto_increment FIRST, ADD PRIMARY KEY (Id);
\ No newline at end of file
Index: core/units/user_groups/user_groups_eh.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/units/user_groups/user_groups_eh.php	(revision 15965)
+++ core/units/user_groups/user_groups_eh.php	(revision )
@@ -43,8 +43,12 @@
 				$new_groups = array_diff($new_groups, $old_groups);
 
 				if ($new_groups) {
+					$new_id = (int)$this->Conn->GetOne('SELECT MIN(Id) FROM ' . $table_name .' WHERE Id < 0' );
+
 					foreach ($new_groups as $new_group) {
+						$new_id--;
 						$fields_hash = Array (
+							'Id'			=>	$new_id,
 							'GroupId'		=>	$new_group,
 							'PortalUserId'	=>	$user_id,
 						);
@@ -73,8 +77,12 @@
 				$new_users = array_diff($new_users, $old_users);
 
 				if ($new_users) {
+					$new_id = (int)$this->Conn->GetOne('SELECT MIN(Id) FROM ' . $table_name .' WHERE Id < 0' );
+
 					foreach ($new_users as $new_user) {
+						$new_id--;
 						$fields_hash = Array (
+							'Id'			=>	$new_id,
 							'GroupId'		=>	$group_id,
 							'PortalUserId'	=>	$new_user,
 						);
\ No newline at end of file
Index: core/units/category_items/category_items_event_handler.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/units/category_items/category_items_event_handler.php	(revision 15965)
+++ core/units/category_items/category_items_event_handler.php	(revision )
@@ -54,60 +54,10 @@
 				$table_info = $object->getLinkedInfo();
 
 				$this->Conn->Query('UPDATE ' . $object->TableName . ' SET PrimaryCat = 0 WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId']);
-				$this->Conn->Query('UPDATE ' . $object->TableName . ' SET PrimaryCat = 1 WHERE (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ') AND (CategoryId = ' . $id . ')');
+				$this->Conn->Query('UPDATE ' . $object->TableName . ' SET PrimaryCat = 1 WHERE (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ') AND (Id = ' . $id . ')');
 			}
 
 			$event->SetRedirectParam('opener', 's');
-		}
-
-		/**
-		 * Apply custom processing to item
-		 *
-		 * @param kEvent $event
-		 * @param string $type
-		 * @return void
-		 * @access protected
-		 */
-		protected function customProcessing(kEvent $event, $type)
-		{
-			if ( $event->Name == 'OnMassDelete' ) {
-				$object = $event->getObject();
-				$table_info = $object->getLinkedInfo();
-
-				switch ($type) {
-					case 'before':
-						$ids = $event->getEventParam('ids');
-
-						if ( $ids ) {
-							$sql = 'SELECT CategoryId
-									FROM ' . $object->TableName . '
-									WHERE (PrimaryCat = 0) AND (' . $table_info['ForeignKey'] . '=' . $table_info['ParentId'] . ') AND CategoryId IN (' . implode(',', $ids) . ')';
-							$event->setEventParam('ids', $this->Conn->GetCol($sql));
-						}
-						break;
-
-					// not needed because 'before' does not allow to delete primary cat!
-					/*case 'after':
-						// set 1st not deleted category as primary
-						$sql = 'SELECT COUNT(*)
-								FROM ' . $object->TableName . '
-								WHERE (PrimaryCat = 1) AND (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ')';
-						$has_primary = $this->Conn->GetOne($sql);
-
-						if ( !$has_primary ) {
-							$sql = 'SELECT CategoryId
-									FROM ' . $object->TableName . '
-									WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'];
-							$cat_id = $this->Conn->GetOne($sql);
-
-							$sql = 'UPDATE ' . $object->TableName . '
-									SET PrimaryCat = 1
-									WHERE (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ') AND (CategoryId = ' . $cat_id . ')';
-							$this->Conn->Query($sql);
-						}
-						break;*/
-				}
-			}
 		}
 
 		/**
\ No newline at end of file
Index: core/kernel/utility/temp_handler.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/kernel/utility/temp_handler.php	(revision 15965)
+++ core/kernel/utility/temp_handler.php	(revision )
@@ -736,7 +736,8 @@
 		// copy ALL records with positive ids (since negative ids were processed above) to live table
 		$sql = 'INSERT INTO ' . $this->_tableName . '
 				SELECT *
-				FROM ' . $this->_getTempTableName();
+				FROM ' . $this->_getTempTableName() . '
+				WHERE 1';
 		$this->Conn->Query($this->_addConstrain($sql));
 
 		$this->_saveId('', $live_ids);
@@ -806,7 +807,8 @@
 	{
 		if ( !$ids ) {
 			$sql = 'SELECT ' . $this->_idField . '
-					FROM ' . $this->_getTempTableName();
+					FROM ' . $this->_getTempTableName() . '
+					WHERE 1';
 			$ids = $this->Conn->GetCol($this->_addConstrain($sql));
 		}
 
\ No newline at end of file
Index: core/admin_templates/users/users_edit_groups.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/users/users_edit_groups.tpl	(revision 15965)
+++ core/admin_templates/users/users_edit_groups.tpl	(revision )
@@ -94,7 +94,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="u-ug" IdField="GroupId" grid="Default"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u-ug" IdField="Id" grid="Default"/>
 <script type="text/javascript">
 	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'edit', 'setprimary') );
 </script>
\ No newline at end of file
Index: core/units/category_items/category_items_config.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/units/category_items/category_items_config.php	(revision 15965)
+++ core/units/category_items/category_items_config.php	(revision )
@@ -16,7 +16,7 @@
 
 $config = Array (
 	'Prefix' => 'ci',
-	'ItemClass' => Array ('class' => 'CategoryItems_DBItem', 'file' => 'category_items_dbitem.php', 'build_event' => 'OnItemBuild'),
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
 	'EventHandlerClass' => Array ('class' => 'CategoryItemsEventHander', 'file' => 'category_items_event_handler.php', 'build_event' => 'OnBuild'),
 	'TagProcessorClass' => Array ('class' => 'CategoryItemsTagProcessor', 'file' => 'category_items_tag_processor.php', 'build_event' => 'OnBuild'),
@@ -29,7 +29,7 @@
 		4 => 'event',
 	),
 
-	'IDField' => 'CategoryId',	// in this case idfield doesn't exit in destination table
+	'IDField' => 'Id',
 	'StatusField' => Array ('PrimaryCat'),	// field, that is affected by Approve/Decline events
 
 	'TableName' => TABLE_PREFIX.'CategoryItems',
@@ -41,7 +41,6 @@
 
 	'CalculatedFields' => Array (
 		'' => Array (
-			'DummyId' => 'IF(ISNULL(c.CategoryId),0,c.CategoryId)',
 			'CategoryStatus'=>	'c.Status',
 		)
 	),
@@ -58,7 +57,7 @@
 	),
 
 	'Fields' => Array (
-		'DummyId' => Array (),
+		'Id' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'CategoryId' => Array ('type' => 'int', 'not_null'=>1,'default'=>0),
 		'ItemResourceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'PrimaryCat' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -68,7 +67,6 @@
 
 	'VirtualFields' => Array (
 		'CategoryName' => Array ('type' => 'string', 'default' => ''),
-		'DummyId' => Array ('type' => 'int', 'default' => 0),
 		'CategoryStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'default' => 1),
 	),
 
\ No newline at end of file
Index: core/kernel/db/cat_dbitem.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/kernel/db/cat_dbitem.php	(revision 15965)
+++ core/kernel/db/cat_dbitem.php	(revision )
@@ -409,7 +409,7 @@
 			$this->Conn->Query($sql);
 		}
 		else {
-			$fields_hash = 	Array(
+			$fields_hash = 	Array (
 				'CategoryId'		=>	$category_id,
 				'ItemResourceId'	=>	$this->GetField('ResourceId'),
 				'PrimaryCat'		=>	$is_primary ? 1 : 0,
@@ -417,6 +417,11 @@
 				'Filename'			=>	$this->useFilenames ? (string)$this->GetDBField('Filename') : '', // because some prefixes does not use filenames,
 			);
 
+			if ( $this->Application->IsTempTable($table) ) {
+				$new_id = (int)$this->Conn->GetOne('SELECT MIN(Id) FROM ' . $table .' WHERE Id < 0' );
+				$fields_hash['Id'] = $new_id - 1;
+			}
+
 			$this->Conn->doInsert($fields_hash, $table);
 		}
 
\ No newline at end of file
Index: core/units/user_groups/user_groups_dbitem.php
===================================================================
--- core/units/user_groups/user_groups_dbitem.php	(revision 15965)
+++ core/units/user_groups/user_groups_dbitem.php	(revision 15965)
@@ -1,42 +0,0 @@
-<?php
-/**
-* @version	$Id: user_groups_dbitem.php 14628 2011-10-04 09:36:30Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-defined('FULL_PATH') or die('restricted access!');
-
-class UserGroups_DBItem extends kDBItem {
-
-	/**
-	 * Returns part of SQL WHERE clause identifying the record, ex. id = 25
-	 *
-	 * @param string $method Child class may want to know who called GetKeyClause, Load(), Update(), Delete() send its names as method
-	 * @param Array $keys_hash alternative, then item id, keys hash to load item by
-	 * @see kDBItem::Load()
-	 * @see kDBItem::Update()
-	 * @see kDBItem::Delete()
-	 *
-	 * @return string
-	 * @access protected
-	 */
-	protected function GetKeyClause($method = null, $keys_hash = null)
-	{
-		$table_info = $this->getLinkedInfo($this->Special, true);
-
-		if ( $table_info ) {
-			// we have parent info, then use it
-			$keys_hash = Array ($this->IDField => $this->GetID(), $table_info['ForeignKey'] => $table_info['ParentId']);
-		}
-
-		return parent::GetKeyClause($method, $keys_hash);
-	}
-}
\ No newline at end of file
Index: core/admin_templates/groups/groups_edit_users.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/groups/groups_edit_users.tpl	(revision 15965)
+++ core/admin_templates/groups/groups_edit_users.tpl	(revision )
@@ -86,7 +86,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="g-ug" IdField="PortalUserId" grid="GroupUsers"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="g-ug" IdField="Id" grid="GroupUsers"/>
 <script type="text/javascript">
 	Grids['g-ug'].SetDependantToolbarButtons( new Array('delete') );
 	Grids['g-ug'].DblClick = function() {return false};
\ No newline at end of file
Index: core/units/user_groups/user_groups_config.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/units/user_groups/user_groups_config.php	(revision 15965)
+++ core/units/user_groups/user_groups_config.php	(revision )
@@ -22,8 +22,6 @@
 			'ForeignKey' => 'GroupId',
 			'ParentTableKey' => 'GroupId',
 
-			'IDField' => 'PortalUserId',
-
 			'ListSQLs' => Array (
 				'' => '	SELECT %1$s.* %2$s FROM %1$s
 						LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId
@@ -45,7 +43,7 @@
 				'GroupUsers' => Array (
 					'Icons' => Array ('default' => 'icon16_item.png'),
 					'Fields' => Array (
-						'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+						'Id' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 						'UserName' => Array ('title' => 'la_col_UserFirstLastName', 'width' => 200, ),
 						'UserLogin' => Array ('title' => 'column:la_fld_Username', 'width' => 100, ),
 						'PrimaryGroup' => Array ( 'title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
@@ -62,7 +60,7 @@
 		),
 	),
 
-	'ItemClass' => Array ('class' => 'UserGroups_DBItem', 'file' => 'user_groups_dbitem.php', 'build_event' => 'OnItemBuild'),
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
 	'EventHandlerClass' => Array ('class' => 'UserGroupsEventHandler', 'file' => 'user_groups_eh.php', 'build_event' => 'OnBuild'),
 	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
@@ -76,7 +74,7 @@
 		4 => 'event',
 	),
 
-	'IDField' => 'GroupId',
+	'IDField' => 'Id',
 
 	'TitleField' => 'GroupName',
 	'TableName' => TABLE_PREFIX.'UserGroupRelations',
@@ -100,6 +98,7 @@
 	),
 
 	'Fields' => Array (
+		'Id' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'GroupId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'MembershipExpires' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
@@ -124,7 +123,7 @@
 				1 => 'icon16_primary.png'
 			),
 			'Fields' => Array (
-				'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Id' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 				'GroupName' => Array ('width' => 100, ),
 				'GroupDescription' => Array ('title' => 'column:la_fld_Description', 'width' => 150, ),
 				'PrimaryGroup' => Array ( 'title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
\ No newline at end of file
Index: admin/system_presets/simple/groups_g.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- admin/system_presets/simple/groups_g.php	(revision 15965)
+++ admin/system_presets/simple/groups_g.php	(revision )
@@ -9,7 +9,7 @@
 
 	// sections shown with debug on
 	$debug_only_sections = Array (
-//		'in-portal:user_groups',
+		'in-portal:user_groups',
 	);
 
 	// toolbar buttons
Index: core/units/users/users_event_handler.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/units/users/users_event_handler.php	(revision 15965)
+++ core/units/users/users_event_handler.php	(revision )
@@ -605,12 +605,24 @@
 					$ug_table = $this->Application->GetTempName($ug_table, 'prefix:' . $event->Prefix);
 				}
 
+				$sql = 'SELECT COUNT(*) FROM ' . $ug_table . '
+						WHERE PortalUserId = ' . $object->GetID() . ' AND GroupId = ' . $primary_group_id;
+
+				if ( $this->Conn->GetOne($sql) ) {
+					return;
+				}
+
 				$fields_hash = Array (
 					'PortalUserId' => $object->GetID(),
 					'GroupId' => $primary_group_id,
 				);
 
-				$this->Conn->doInsert($fields_hash, $ug_table, 'REPLACE');
+				if ( $object->IsTempTable() ) {
+					$new_id = (int)$this->Conn->GetOne('SELECT MIN(Id) FROM ' . $ug_table .' WHERE Id < 0' );
+					$fields_hash['Id'] = $new_id - 1;
+				}
+
+				$this->Conn->doInsert($fields_hash, $ug_table);
 			}
 		}
 
Index: core/install/install_schema.sql
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/install/install_schema.sql	(revision 15965)
+++ core/install/install_schema.sql	(revision )
@@ -407,11 +407,13 @@
 );
 
 CREATE TABLE UserGroupRelations (
+  Id int(11) NOT NULL auto_increment,
   PortalUserId int(11) NOT NULL DEFAULT '0',
   GroupId int(11) NOT NULL DEFAULT '0',
   MembershipExpires int(10) unsigned DEFAULT NULL,
   ExpirationReminderSent tinyint(4) NOT NULL DEFAULT '0',
-  PRIMARY KEY (PortalUserId,GroupId),
+  PRIMARY KEY (Id),
+  UNIQUE KEY UserGroup (PortalUserId,GroupId),
   KEY GroupId (GroupId),
   KEY MembershipExpires (MembershipExpires),
   KEY ExpirationReminderSent (ExpirationReminderSent)
@@ -636,11 +638,13 @@
 );
 
 CREATE TABLE CategoryItems (
+  Id int(11) NOT NULL auto_increment,
   CategoryId int(11) NOT NULL default '0',
   ItemResourceId int(11) NOT NULL default '0',
   PrimaryCat tinyint(4) NOT NULL default '0',
   ItemPrefix varchar(50) NOT NULL default '',
   Filename varchar(255) NOT NULL default '',
+  PRIMARY KEY (Id),
   UNIQUE KEY CategoryId (CategoryId,ItemResourceId),
   KEY PrimaryCat (PrimaryCat),
   KEY ItemPrefix (ItemPrefix),
@@ -1052,11 +1056,13 @@
 );
 
 CREATE TABLE SpamControl (
+	Id int(11) NOT NULL auto_increment,
   ItemResourceId int(11) NOT NULL default '0',
   IPaddress varchar(20) NOT NULL default '',
   Expire INT UNSIGNED NULL DEFAULT NULL,
   PortalUserId int(11) NOT NULL default '0',
   DataType varchar(20) default NULL,
+  PRIMARY KEY (Id),
   KEY PortalUserId (PortalUserId),
   KEY Expire (Expire),
   KEY DataType (DataType),
\ No newline at end of file
Index: core/admin_templates/users/admins_edit_groups.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/users/admins_edit_groups.tpl	(revision 15965)
+++ core/admin_templates/users/admins_edit_groups.tpl	(revision )
@@ -93,7 +93,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="u-ug" IdField="GroupId" grid="Default"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u-ug" IdField="Id" grid="Default"/>
 <script type="text/javascript">
 	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'edit', 'setprimary') );
 </script>
\ No newline at end of file
Index: core/units/category_items/category_items_dbitem.php
===================================================================
--- core/units/category_items/category_items_dbitem.php	(revision 15965)
+++ core/units/category_items/category_items_dbitem.php	(revision 15965)
@@ -1,47 +0,0 @@
-<?php
-/**
-* @version	$Id: category_items_dbitem.php 14870 2011-12-16 11:54:01Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-defined('FULL_PATH') or die('restricted access!');
-
-class CategoryItems_DBItem extends kDBItem {
-
-	/**
-	 * Returns part of SQL WHERE clause identifying the record, ex. id = 25
-	 *
-	 * @param string $method Child class may want to know who called GetKeyClause, Load(), Update(), Delete() send its names as method
-	 * @param Array $keys_hash alternative, then item id, keys hash to load item by
-	 * @see kDBItem::Load()
-	 * @see kDBItem::Update()
-	 * @see kDBItem::Delete()
-	 * @return string
-	 * @access protected
-	 */
-	protected function GetKeyClause($method = null, $keys_hash = null)
-	{
-		$table_info = $this->getLinkedInfo();
-
-		return '(CategoryId=' . $this->GetID() . ' AND ' . $table_info['ForeignKey'] . '=' . $table_info['ParentId'] . ')';
-	}
-
-	/**
-	 * Generate and set new temporary id
-	 *
-	 * @return void
-	 * @access public
-	 */
-	public function setTempID()
-	{
-		// don't set temp id for this item
-	}
-}
\ No newline at end of file
Index: core/kernel/db/cat_event_handler.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/kernel/db/cat_event_handler.php	(revision 15965)
+++ core/kernel/db/cat_event_handler.php	(revision )
@@ -2200,7 +2200,7 @@
 
 		$object->SetDBField($cached_field, $object->GetField($id_field));
 		$options = $object->GetFieldOptions($id_field);
-
+		$user_id = $this->Application->RecallVar('user_id');
 		if ( isset($options['options'][$user_id]) ) {
 			$object->SetDBField($cached_field, $options['options'][$user_id]);
 		}
\ No newline at end of file