Index: trunk/kernel/units/categories/cache_updater.php
===================================================================
diff -u -r5173 -r5176
--- trunk/kernel/units/categories/cache_updater.php	(.../cache_updater.php)	(revision 5173)
+++ trunk/kernel/units/categories/cache_updater.php	(.../cache_updater.php)	(revision 5176)
@@ -48,8 +48,8 @@
 
 class clsCachedPermissions
 {
-	var $Allow;
-	var $Deny;
+	var $Allow = Array();
+	var $Deny = Array();
 	var $CatId;
 
 	function clsCachedPermissions($CatId)
Index: trunk/kernel/units/categories/categories_event_handler.php
===================================================================
diff -u -r5173 -r5176
--- trunk/kernel/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 5173)
+++ trunk/kernel/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 5176)
@@ -266,6 +266,22 @@
 			}
 		}
 	}
+	
+	/**
+	 * Checks cache update mark and redirect to cache if needed
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSave(&$event)
+	{
+		parent::OnSave($event);
+		if ($event->status == erSUCCESS && $this->Application->GetVar('require_cache_update')) {
+			// "catalog" should be in opener stack by now
+			$opener_stack = unserialize($this->Application->RecallVar('opener_stack'));
+			$opener_stack[0] = str_replace('catalog', 'categories/cache_updater', $opener_stack[0]);
+			$this->Application->StoreVar('opener_stack', serialize($opener_stack));
+		}
+	}
 }
 
 ?>
\ No newline at end of file
Index: trunk/core/kernel/utility/temp_handler.php
===================================================================
diff -u -r5174 -r5176
--- trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 5174)
+++ trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 5176)
@@ -453,15 +453,9 @@
 			// because items from Sub Tables get deteleted in CopySubTablesToLive !BY ForeignKey!
 			if ($master['TableName'] == $this->MasterTable) {
 				$this->RaiseEvent( 'OnBeforeDeleteFromLive', $master['Prefix'], '', $current_ids );
-
-				// Do not delete live items with 0 id
-				// otherwise home category permissions got deleted when creating new category
-				$del_ids = $current_ids;
-				array_splice($del_ids, array_search(0, $current_ids), 1);
-				if (count($del_ids) >= 1) {
-					$query = 'DELETE FROM '.$master['TableName'].' WHERE '.$master['IdField'].' IN ('.join(',', $del_ids).')';
-					$this->Conn->Query($query);
-				}
+			
+				$query = 'DELETE FROM '.$master['TableName'].' WHERE '.$master['IdField'].' IN ('.join(',', $current_ids).')';
+				$this->Conn->Query($query);
 			}
 
 			if ( getArrayValue($master, 'SubTables') ) {
@@ -578,9 +572,15 @@
 			// delete records from live table by foreign key, so that records deleted from temp table
 			// get deleted from live
 			if (count($current_ids) > 0  && !in_array($table_sig, $this->CopiedTables) ) {
-				$foreign_key_field =  is_array($sub_table['ForeignKey']) ? getArrayValue($sub_table, 'ForeignKey', $master['Prefix']) : $sub_table['ForeignKey'];
+				$foreign_key_field = is_array($sub_table['ForeignKey']) ? getArrayValue($sub_table, 'ForeignKey', $master['Prefix']) : $sub_table['ForeignKey'];
 				if (!$foreign_key_field) continue;
 				$foreign_keys = $this->GetForeignKeys($master, $sub_table, $current_ids);
+				// Do not delete live sub-items with 0 id
+				// otherwise home category permissions got deleted when creating new category
+				$zero_id = array_search(0, $foreign_keys);
+				if ($zero_id !== false) {
+					array_splice($foreign_keys, $zero_id, 1);
+				}
 				if (count($foreign_keys) > 0) {
 					$query = 'SELECT '.$sub_table['IdField'].' FROM '.$sub_table['TableName'].'
 										WHERE '.$foreign_key_field.' IN ('.join(',', $foreign_keys).')';
Index: trunk/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r5173 -r5176
--- trunk/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 5173)
+++ trunk/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 5176)
@@ -266,6 +266,22 @@
 			}
 		}
 	}
+	
+	/**
+	 * Checks cache update mark and redirect to cache if needed
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSave(&$event)
+	{
+		parent::OnSave($event);
+		if ($event->status == erSUCCESS && $this->Application->GetVar('require_cache_update')) {
+			// "catalog" should be in opener stack by now
+			$opener_stack = unserialize($this->Application->RecallVar('opener_stack'));
+			$opener_stack[0] = str_replace('catalog', 'categories/cache_updater', $opener_stack[0]);
+			$this->Application->StoreVar('opener_stack', serialize($opener_stack));
+		}
+	}
 }
 
 ?>
\ No newline at end of file
Index: trunk/kernel/admin_templates/xml/categories_list.tpl
===================================================================
diff -u -r5171 -r5176
--- trunk/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 5171)
+++ trunk/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 5176)
@@ -51,8 +51,8 @@
 			<input type="checkbox" name="<inp2:InputName field="$IdField"/>" id="<inp2:InputName field="$IdField"/>">
 			<img src="<inp2:ModulePath />img/itemicons/<inp2:ItemIcon grid="Default"/>">&nbsp;<span class="priority"><inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse"><sup><inp2:Field field="Priority"/></sup></inp2:m_if></span>
 			<a class="link" href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>);"><b><inp2:Field name="Name"/></b></a><span class="cat_desc">:</span>
-			<span class="cat_pick"><inp2:m_if check="IsPick">Pick</inp2:m_if></span>
-			<span class="cat_new"><inp2:m_if check="IsNew">New</inp2:m_if></span>
+			<inp2:m_RenderElement name="status_mark" field="EditorsPick" type="pick" PrefixSpecial="$PrefixSpecial"/>
+			<inp2:m_RenderElement name="status_mark" field="IsNew" type="new" PrefixSpecial="$PrefixSpecial"/>
 			<span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span><br>
 			<div style="padding-left: 3px;">
 				<span class="cat_desc"><inp2:Field field="Description"/></span><br>
Index: trunk/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -r5171 -r5176
--- trunk/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 5171)
+++ trunk/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 5176)
@@ -51,8 +51,8 @@
 			<input type="checkbox" name="<inp2:InputName field="$IdField"/>" id="<inp2:InputName field="$IdField"/>">
 			<img src="<inp2:ModulePath />img/itemicons/<inp2:ItemIcon grid="Default"/>">&nbsp;<span class="priority"><inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse"><sup><inp2:Field field="Priority"/></sup></inp2:m_if></span>
 			<a class="link" href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>);"><b><inp2:Field name="Name"/></b></a><span class="cat_desc">:</span>
-			<span class="cat_pick"><inp2:m_if check="IsPick">Pick</inp2:m_if></span>
-			<span class="cat_new"><inp2:m_if check="IsNew">New</inp2:m_if></span>
+			<inp2:m_RenderElement name="status_mark" field="EditorsPick" type="pick" PrefixSpecial="$PrefixSpecial"/>
+			<inp2:m_RenderElement name="status_mark" field="IsNew" type="new" PrefixSpecial="$PrefixSpecial"/>
 			<span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span><br>
 			<div style="padding-left: 3px;">
 				<span class="cat_desc"><inp2:Field field="Description"/></span><br>
Index: trunk/admin/category/permcacheupdate.php
===================================================================
diff -u -r4614 -r5176
--- trunk/admin/category/permcacheupdate.php	(.../permcacheupdate.php)	(revision 4614)
+++ trunk/admin/category/permcacheupdate.php	(.../permcacheupdate.php)	(revision 5176)
@@ -48,8 +48,8 @@
 
 class clsCachedPermissions
 {
-	var $Allow;
-	var $Deny;
+	var $Allow = Array();
+	var $Deny = Array();
 	var $CatId;
 
 	function clsCachedPermissions($CatId)
Index: trunk/core/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -r5165 -r5176
--- trunk/core/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 5165)
+++ trunk/core/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 5176)
@@ -1,14 +1,4 @@
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
-
-
-<!-- do this from OnSave php event when substitung opener
-<inp2:m_if check="m_RecallEquals" name="PermCache_UpdateRequired" value="1" inverse="inverse">
-	<script type="text/javascript">
-		window.location.href = '<inp2:m_t t="catalog" pass="all" escape="1"/>';
-	</script>
-</inp2:m_if>
--->
-
 <inp2:m_include t="incs/header" nobody="yes"/>
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
Index: trunk/core/units/categories/cache_updater.php
===================================================================
diff -u -r5173 -r5176
--- trunk/core/units/categories/cache_updater.php	(.../cache_updater.php)	(revision 5173)
+++ trunk/core/units/categories/cache_updater.php	(.../cache_updater.php)	(revision 5176)
@@ -48,8 +48,8 @@
 
 class clsCachedPermissions
 {
-	var $Allow;
-	var $Deny;
+	var $Allow = Array();
+	var $Deny = Array();
 	var $CatId;
 
 	function clsCachedPermissions($CatId)
Index: trunk/kernel/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -r5165 -r5176
--- trunk/kernel/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 5165)
+++ trunk/kernel/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 5176)
@@ -1,14 +1,4 @@
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
-
-
-<!-- do this from OnSave php event when substitung opener
-<inp2:m_if check="m_RecallEquals" name="PermCache_UpdateRequired" value="1" inverse="inverse">
-	<script type="text/javascript">
-		window.location.href = '<inp2:m_t t="catalog" pass="all" escape="1"/>';
-	</script>
-</inp2:m_if>
--->
-
 <inp2:m_include t="incs/header" nobody="yes"/>
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">