Index: branches/5.0.x/core/kernel/db/cat_dbitem.php
===================================================================
diff -u -r12511 -r12535
--- branches/5.0.x/core/kernel/db/cat_dbitem.php	(.../cat_dbitem.php)	(revision 12511)
+++ branches/5.0.x/core/kernel/db/cat_dbitem.php	(.../cat_dbitem.php)	(revision 12535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_dbitem.php 12511 2009-09-15 19:27:06Z alex $
+* @version	$Id: cat_dbitem.php 12535 2009-09-16 18:11:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -67,11 +67,14 @@
 		$this->SetDBField('Modified_date', adodb_mktime() );
 		$this->SetDBField('Modified_time', adodb_mktime() );
 
-		if ($this->mode != 't' && !$this->Application->IsAdmin()) {
-			$owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField');
-			if (!$owner_field) {
-				$owner_field = 'CreatedById';
-			}
+		$is_admin = $this->Application->IsAdmin();
+		$owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField');
+
+		if (!$owner_field) {
+			$owner_field = 'CreatedById';
+		}
+
+		if ((!$this->IsTempTable() && !$is_admin) || ($is_admin && !$this->GetDBField($owner_field))) {
 			$this->SetDBField($owner_field, $this->Application->RecallVar('user_id'));
 		}
 
Index: branches/5.0.x/core/units/languages/languages_config.php
===================================================================
diff -u -r12495 -r12535
--- branches/5.0.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 12535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: languages_config.php 12535 2009-09-16 18:11:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -88,7 +88,7 @@
 
 												'languages_list'			=>	Array(
 													'prefixes'	=>	Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks!",
-													'toolbar_button' => Array ('new_item', 'edit', 'delete', 'export', 'import', 'setprimary', 'refresh', 'view', 'dbl-click'),
+													'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'export', 'import', 'setprimary', 'refresh', 'view', 'dbl-click'),
 												),
 
 												'languages_edit_general'	=>	Array(	'prefixes'	=> Array('lang'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_General!"),
Index: branches/5.0.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r12525 -r12535
--- branches/5.0.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 12525)
+++ branches/5.0.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 12535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 12525 2009-09-16 11:17:05Z alex $
+* @version	$Id: categories_event_handler.php 12535 2009-09-16 18:11:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -712,6 +712,9 @@
 
 			// 3. prepare priorities dropdown
 			$priority_helper->preparePriorities($event, true, 'ParentId = ' . $category_id);
+
+			// 4. set default owner
+			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 		}
 
 		/**
@@ -1241,6 +1244,11 @@
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$object->SetDBField('ModifiedById', $this->Application->RecallVar('user_id'));
+
 			$this->_beforeItemChange($event);
 		}
 
@@ -1467,6 +1475,10 @@
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
+			$now = adodb_mktime();
+
+			$object->SetDBField('Modified_date', $now);
+			$object->SetDBField('Modified_time', $now);
 			$object->SetDBField('Template', $this->_stripTemplateExtension( $object->GetDBField('Template') ));
 
 			if ($object->GetDBField('IsSystem') == 1) {
Index: branches/5.0.x/core/units/agents/agents_config.php
===================================================================
diff -u -r12495 -r12535
--- branches/5.0.x/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 12535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: agents_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: agents_config.php 12535 2009-09-16 18:11:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -60,11 +60,11 @@
 
 			'agent_list' => Array (
 				'prefixes' => Array ('agent_List'), 'format' => "!la_title_Agents!",
-				'toolbar_button' => Array ('new_agent', 'edit', 'delete', 'approve', 'decline', 'cancel', 'view', 'dbl-click'),
+				'toolbar_buttons' => Array ('new_agent', 'edit', 'delete', 'approve', 'decline', 'cancel', 'view', 'dbl-click'),
 				),
 
 			'agent_edit' => Array ('prefixes' => Array ('agent'), 'format' => "#agent_status# '#agent_titlefield#'",
-				'toolbar_button' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 				),
 		),
 
Index: branches/5.0.x/core/units/email_events/email_events_config.php
===================================================================
diff -u -r12495 -r12535
--- branches/5.0.x/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 12535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: email_events_config.php 12535 2009-09-16 18:11:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -43,7 +43,7 @@
 
 			'email_settings_edit' => Array (
 				'prefixes' => Array ('emailevents'), 'format' => "#emailevents_status# '#emailevents_titlefield#'",
-				'toolbar_button' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 			),
 
 			'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
Index: branches/5.0.x/admin/system_presets/simple/thesaurus_thesaurus.php
===================================================================
diff -u -r12329 -r12535
--- branches/5.0.x/admin/system_presets/simple/thesaurus_thesaurus.php	(.../thesaurus_thesaurus.php)	(revision 12329)
+++ branches/5.0.x/admin/system_presets/simple/thesaurus_thesaurus.php	(.../thesaurus_thesaurus.php)	(revision 12535)
@@ -9,7 +9,7 @@
 
 	// sections shown with debug on
 	$debug_only_sections = Array (
-		'in-portal:thesaurus',
+//		'in-portal:thesaurus',
 	);
 
 	// toolbar buttons
Index: branches/5.0.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r12511 -r12535
--- branches/5.0.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 12511)
+++ branches/5.0.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 12535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 12511 2009-09-15 19:27:06Z alex $
+* @version	$Id: db_event_handler.php 12535 2009-09-16 18:11:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -476,6 +476,8 @@
 			$this->Application->SetVar('t', $error_template);
 			$this->Application->SetVar('m_cat_id', $themes_helper->getPageByTemplate($error_template));
 
+			// in case if missing item is recalled first from event (not from template)
+			$this->Application->InitParser();
 			$this->Application->HTML = $this->Application->ParseBlock( Array ('name' => $error_template) );
 			$this->Application->Done();
 			exit;
Index: branches/5.0.x/core/units/categories/categories_item.php
===================================================================
diff -u -r12511 -r12535
--- branches/5.0.x/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 12511)
+++ branches/5.0.x/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 12535)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_item.php 12511 2009-09-15 19:27:06Z alex $
+* @version	$Id: categories_item.php 12535 2009-09-16 18:11:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -27,10 +27,12 @@
 			}
 
 			// TODO: move to CategoryEventHandler::OnBeforeItemCreate
-			$this->SetDBField('CreatedById', $this->Application->RecallVar('user_id') );
-			$this->SetDBField('CreatedOn_date', adodb_mktime() );
-			$this->SetDBField('CreatedOn_time', adodb_mktime() );
+			$is_admin = $this->Application->IsAdmin();
 
+			if ((!$this->IsTempTable() && !$is_admin) || ($is_admin && !$this->GetDBField('CreatedById'))) {
+				$this->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
+			}
+
 			$parent_category = $this->GetDBField('ParentId') > 0 ? $this->GetDBField('ParentId') : $this->Application->GetVar('m_cat_id');
 			$this->SetDBField('ParentId', $parent_category);
 
Index: branches/5.0.x/admin/system_presets/simple/categories_c.php
===================================================================
diff -u -r12519 -r12535
--- branches/5.0.x/admin/system_presets/simple/categories_c.php	(.../categories_c.php)	(revision 12519)
+++ branches/5.0.x/admin/system_presets/simple/categories_c.php	(.../categories_c.php)	(revision 12535)
@@ -42,7 +42,7 @@
 	$hidden_fields = Array (
 		'CategoryId', /*'Type',*/ 'SymLinkCategoryId', /*'ParentId', 'Name', 'Filename', 'AutomaticFilename',*/
 		'Description', 'CreatedOn', 'EditorsPick', 'Status', /*'Priority', 'MetaKeywords', 'CachedDescendantCatsQty',
-		'CachedNavbar', 'CreatedById', 'ResourceId', 'ParentPath', 'TreeLeft', 'TreeRight', 'NamedParentPath',
+		'CachedNavbar',*/ 'CreatedById', /*'ResourceId', 'ParentPath', 'TreeLeft', 'TreeRight', 'NamedParentPath',
 		'MetaDescription', 'HotItem',*/ 'NewItem', /*'PopItem', 'Modified', 'ModifiedById', 'CachedTemplate',*/
 		'Template', 'UseExternalUrl', 'ExternalUrl', 'UseMenuIconUrl', 'MenuIconUrl', 'Title', 'MenuTitle',
 		/*'MetaTitle', 'IndexTools', 'IsIndex', 'IsMenu', 'IsSystem',*/ 'FormId', 'FormSubmittedTemplate',
Index: branches/5.0.x/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r12231 -r12535
--- branches/5.0.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 12231)
+++ branches/5.0.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 12535)
@@ -63,10 +63,11 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="c" fields="CategoryId,Name,Description,AutomaticFilename,Filename,SymLinkCategoryId" title="!la_section_Category!"/>
+		<inp2:m_RenderElement name="subsection" prefix="c" fields="CategoryId,Name,Description,CreatedById,AutomaticFilename,Filename,SymLinkCategoryId" title="!la_section_Category!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_PageTitle!" size="70"/> <!-- la_fld_Name -->
 			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" control_options="{min_height: 130}" rows="7" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="c" field="CreatedById" title="la_fld_CreatedById" size="30" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="la_fld_AutoCreateFileName" onclick="reflectFilename()"/> <!-- la_fld_CategoryAutomaticFilename -->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="la_fld_Filename" size="70" /> <!-- la_fld_CategoryFilename -->
 			<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>