Index: branches/5.3.x/units/products/products_config.php
===================================================================
diff -u -N -r15675 -r15899
--- branches/5.3.x/units/products/products_config.php	(.../products_config.php)	(revision 15675)
+++ branches/5.3.x/units/products/products_config.php	(.../products_config.php)	(revision 15899)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 15675 2013-01-17 12:08:15Z alex $
+* @version	$Id: products_config.php 15899 2013-07-12 10:32:25Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -42,20 +42,8 @@
 	'RewriteListener' => 'CategoryItemRewrite:RewriteListener',
 
 	'Hooks' => Array (
-		// for subscription products: access group is saved before changing pricings
 		Array (
 			'Mode' => hAFTER,
-			'Conditional' => true,
-			'HookToPrefix' => 'pr',
-			'HookToSpecial' => '*',
-			'HookToEvent' => Array ('OnNew', 'OnAfterItemLoad'),
-			'DoPrefix' => '',
-			'DoSpecial' => '*',
-			'DoEvent' => 'OnPreSave',
-		),
-
-		Array (
-			'Mode' => hAFTER,
 			'Conditional' => false,
 			'HookToPrefix' => 'lst',
 			'HookToSpecial' => '',
@@ -417,21 +405,21 @@
 					FROM %1$s
 					LEFT JOIN '.TABLE_PREFIX.'UserGroups ON '.TABLE_PREFIX.'UserGroups.GroupId = %1$s.AccessGroupId
 					LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
+					{PERM_JOIN}
 					LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
 					LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
 					LEFT JOIN '.TABLE_PREFIX.'%3$sProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
 					LEFT JOIN '.TABLE_PREFIX.'%3$sProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
 					LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId
-					LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
 					LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 
 		'showall' => 'SELECT %1$s.* %2$s FROM %1$s
 					LEFT JOIN '.TABLE_PREFIX.'%3$sProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
 					LEFT JOIN '.TABLE_PREFIX.'%3$sProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
 					LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId
 					LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
+					{PERM_JOIN}
 					LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-					LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
 					LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 	),