Index: trunk/kernel/action.php
===================================================================
diff -u -N -r4121 -r4124
--- trunk/kernel/action.php	(.../action.php)	(revision 4121)
+++ trunk/kernel/action.php	(.../action.php)	(revision 4124)
@@ -750,8 +750,8 @@
 		$objEditItems->SourceTable = $objSession->GetEditTable("Category");
    
 		$fields_hash = Array(	'ParentId'			=>	GetVar('ParentId'),
-								'Name'				=>	GetVar('cat_name'),
-								'Description'		=>	inp_escape(GetVar('cat_desc'), (int)$_POST["html_enable"]),
+								'Name'				=>	inp_escape(GetVar('cat_name'), (int)GetVar('html_enable')),
+								'Description'		=>	inp_escape(GetVar('cat_desc'), (int)GetVar('html_enable')),
 								'CreatedOn'			=>	$created_on,
 								'EditorsPick'		=>	GetVar('cat_pick'),
 								'Status'			=>	(int)GetVar('status'),
@@ -766,7 +766,8 @@
 								'CategoryTemplate'	=>	GetVar('category_template'),
 								'ItemTemplate'		=>	GetVar('item_template'),
 						);
-         
+						
+        $objSession->SetVariable('PermCache_UpdateRequired', 1); 
 		$cat =& $objEditItems->Add_NEW($fields_hash);
 		saveCustomFields('c', $cat->Get('ResourceId'), 1);
 		break;
@@ -776,14 +777,18 @@
         $application->SetVar('c_mode', 't');
        
         $objEditItems = new clsCatList();
-        $objEditItems->SourceTable = $objSession->GetEditTable("Category");
+        $objEditItems->SourceTable = $objSession->GetEditTable('Category');
 
 		// check if name of cat isn't changed: begin
 		if (GetVar('CategoryId') > 0) {
 			$original_cats = new clsCatList();
 			$original_cat = $original_cats->GetItemByField('CategoryId', GetVar('CategoryId'));
 
-			$match_fields = Array('Name' => 'cat_name', 'Filename' => 'filename');
+			$match_fields = Array(	'Name'				=>	'cat_name',
+									'Filename'			=>	'filename',
+									'CategoryTemplate'	=>	'category_template',
+									'ItemTemplate'		=>	'item_template');
+									
 			foreach ($match_fields as $db_field => $submit_field) {
 				if ($original_cat->Get($db_field) != stripslashes( GetVar($submit_field) )) {
 					$objSession->SetVariable('PermCache_UpdateRequired', 1);