Index: branches/5.2.x/units/topics/topics_config.php
===================================================================
diff -u -N -r14871 -r15008
--- branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 14871)
+++ branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 15008)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_config.php 14871 2011-12-16 11:55:55Z alex $
+* @version	$Id: topics_config.php 15008 2012-01-06 20:37:30Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -286,15 +286,16 @@
 											),
 
 					'TableName'			=>	TABLE_PREFIX.'Topic',
+					'CustomDataTableName' => TABLE_PREFIX . 'TopicCustomData',
 
 					'CalculatedFields' => Array (
 						'' => Array (
 							'UserName' 		=> 'IF (ISNULL(u.Username), IF (%1$s.OwnerId = ' . USER_ROOT . ', "root", IF (%1$s.OwnerId = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
 							'CategoryId'	=>	TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
 							'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
-							'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
+							'CategoryFilename' => TABLE_PREFIX.'Categories.NamedParentPath',
 							'PrimaryCat'	=> TABLE_PREFIX.'%3$sCategoryItems.PrimaryCat',
-							'ParentPath' => TABLE_PREFIX.'Category.ParentPath',
+							'ParentPath' => TABLE_PREFIX.'Categories.ParentPath',
 
 							'AltName'		=>	'img.AltName',
 							'SameImages'	=>	'img.SameImages',
@@ -313,10 +314,10 @@
 					'ListSQLs'			=>	Array (	'' => '	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
-															LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-															LEFT JOIN '.TABLE_PREFIX.'PermCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.OwnerId = u.PortalUserId
+															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.'CategoryPermissionsCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
+															LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.OwnerId = u.PortalUserId
 															LEFT JOIN '.TABLE_PREFIX.'%3$sPosting last_post ON last_post.PostingId = %1$s.LastPostId
 															LEFT JOIN '.TABLE_PREFIX.'%3$sTopicCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 											), // key - special, value - list select sql
@@ -330,9 +331,9 @@
 					'ItemSQLs'			=>	Array (	'' => '	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
-															LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.OwnerId = u.PortalUserId
+															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.'Users u ON %1$s.OwnerId = u.PortalUserId
 															LEFT JOIN '.TABLE_PREFIX.'%3$sPosting last_post ON last_post.PostingId = %1$s.LastPostId
 															LEFT JOIN '.TABLE_PREFIX.'%3$sTopicCustomData cust ON %1$s.ResourceId = cust.ResourceId'),
 
@@ -385,7 +386,7 @@
 			            	'type' => 'int',
 			            	'formatter' => 'kLEFTFormatter',
 			            	'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
-			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
+			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users
 			            					WHERE `%s` = \'%s\' ',
 			            	'left_key_field' => 'PortalUserId',
 			            	'left_title_field' => 'Username',
@@ -396,7 +397,7 @@
 			            	'type' => 'int',
 			            	'formatter' => 'kLEFTFormatter',
 			            	'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
-			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
+			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users
 			            						WHERE `%s` = \'%s\' ',
 			            	'left_key_field' => 'PortalUserId',
 			            	'left_title_field' => 'Username',