Index: branches/RC/core/units/categories/categories_config.php
===================================================================
diff -u -N -r10494 -r10729
--- branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 10494)
+++ branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 10729)
@@ -221,11 +221,13 @@
 
 					'ListSQLs'			=>	Array(	''=>	'	SELECT %1$s.* %2$s
 																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'),
 
 					'ItemSQLs'			=>	Array(	''=>	'	SELECT %1$s.* %2$s
 																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'),
 
@@ -238,12 +240,20 @@
 														)
 										),
 
-					'CalculatedFields'	=>	Array(
-												''	=>	Array(
-														'CurrentSort'	=>	"REPLACE(ParentPath, CONCAT('|', ".'%1$s'.".CategoryId, '|'), '')",
-													)
-											),
+					'CalculatedFields'	=>	Array (
+						''	=>	Array(
+							'CurrentSort'	=>	"REPLACE(ParentPath, CONCAT('|', ".'%1$s'.".CategoryId, '|'), '')",
 
+							'SameImages'	=>	'img.SameImages',
+							'LocalThumb'	=>	'img.LocalThumb',
+							'ThumbPath'		=>	'img.ThumbPath',
+							'ThumbUrl'		=>	'img.ThumbUrl',
+							'LocalImage'	=>	'img.LocalImage',
+							'LocalPath'		=>	'img.LocalPath',
+							'FullUrl'		=>	'img.Url',
+						)
+					),
+
 					'CacheModRewrite' => true,
 
 					'Fields' 			=> 	Array
@@ -280,10 +290,19 @@
 									        ),
 
 					'VirtualFields'		=>	Array(
-													'CurrentSort'	=>	Array('type' => 'string', 'default' => ''),
-													'IsNew'			=>	Array('type' => 'int', 'default' => 0),
-											),
+						'CurrentSort'	=>	Array('type' => 'string', 'default' => ''),
+						'IsNew'			=>	Array('type' => 'int', 'default' => 0),
 
+						// for primary image
+						'SameImages'	=>	Array('type' => 'string', 'default' => ''),
+						'LocalThumb'	=>	Array('type' => 'string', 'default' => ''),
+						'ThumbPath'		=>	Array('type' => 'string', 'default' => ''),
+						'ThumbUrl'		=>	Array('type' => 'string', 'default' => ''),
+						'LocalImage'	=>	Array('type' => 'string', 'default' => ''),
+						'LocalPath'		=>	Array('type' => 'string', 'default' => ''),
+						'FullUrl'		=>	Array('type' => 'string', 'default' => ''),
+					),
+
 					'Grids'	=> Array(
 								'Default'		=>	Array(
 															'Icons' => Array('default'=>'icon16_cat.gif'),