Index: branches/5.1.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r13167 -r13168
--- branches/5.1.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 13167)
+++ branches/5.1.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 13168)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 13167 2010-02-24 15:24:59Z alex $
+* @version	$Id: categories_config.php 13168 2010-02-24 17:26:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -259,7 +259,8 @@
 					FROM %1$s
 					LEFT JOIN '.TABLE_PREFIX.'Images img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
 				 	LEFT JOIN '.TABLE_PREFIX.'PermCache ON '.TABLE_PREFIX.'PermCache.CategoryId = %1$s.CategoryId
-				 	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'
+				 	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId',
+			'-virtual' => 'SELECT %1$s.* %2$s FROM %1$s',
 		),
 
 		'SubItems' => Array ('c-rel', 'c-search','c-img', 'c-cdata', 'c-perm', 'content'),
@@ -282,7 +283,8 @@
 				'LocalPath'		=>	'img.LocalPath',
 				'FullUrl'		=>	'img.Url',
 				'CreatedBySystem' => 'IF(ThemeId != 0, 1, 0)',
-			)
+			),
+			'-virtual' => Array (),
 		),
 
 		'CacheModRewrite' => true,
@@ -363,6 +365,19 @@
 			'FormSubmittedTemplate'	=>	Array ('type' => 'string', 'default' => null),
 			'FriendlyURL'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			'ThemeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+
+			'EnablePageCache' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'not_null' => 1, 'default' => 0
+			),
+			'OverridePageCacheKey' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'not_null' => 1, 'default' => 0
+			),
+			'PageCacheKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+			'PageExpiration' => Array ('type' => 'int', 'default' => NULL),
 		),
 
 		'VirtualFields' => Array (