Index: branches/5.2.x/core/units/structure/structure_config.php
===================================================================
diff -u -N -r14856 -r15012
--- branches/5.2.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 14856)
+++ branches/5.2.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 15012)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: structure_config.php 14856 2011-12-08 17:01:53Z alex $
+* @version	$Id: structure_config.php 15012 2012-01-06 20:38:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -72,7 +72,8 @@
 
 		'TitleField'		=>	'Name',		// field, used in bluebar when editing existing item
 
-		'TableName'			=>	TABLE_PREFIX.'Category',
+		'TableName'			=>	TABLE_PREFIX.'Categories',
+		'CustomDataTableName' => TABLE_PREFIX . 'CategoryCustomData',
 
 		'TitlePresets'		=>	Array(
 			'default'		=>	Array(	'new_status_labels'		=> Array('st'=>'!la_title_Adding_Category!'),
@@ -100,7 +101,7 @@
 		'ListSQLs'			=>	Array (
 			'' => '	SELECT %1$s.* %2$s
 					FROM %1$s
-					LEFT JOIN '.TABLE_PREFIX.'PermCache ON '.TABLE_PREFIX.'PermCache.CategoryId = %1$s.CategoryId',
+					LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsCache ON '.TABLE_PREFIX.'CategoryPermissionsCache.CategoryId = %1$s.CategoryId',
 			'-virtual' => 'SELECT %1$s.* %2$s FROM %1$s',
 		),
 
@@ -140,7 +141,7 @@
             'MetaKeywords'				=>	Array('type' => 'string', 'default' => null),
             'CachedDescendantCatsQty'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
             'CachedNavbar'				=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
-            'CreatedById'				=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL),
+            'CreatedById'				=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL),
             'ResourceId'				=>	Array('type' => 'int', 'default' => null),
             'ParentPath'				=>	Array('type' => 'string', 'default' => null),
 		    'TreeLeft'					=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -151,7 +152,7 @@
             'NewItem'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
             'PopItem'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
             'Modified'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
-            'ModifiedById'				=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL),
+            'ModifiedById'				=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL),
             'CachedTemplate'			=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
 
 
@@ -161,7 +162,7 @@
 		    	'formatter' => 'kOptionsFormatter', 'options_sql' => '	SELECT	CONCAT(tf.Description, " (", TRIM(TRAILING ".des" FROM TRIM(TRAILING ".tpl" FROM FileName) ), ")") AS Title,
 																					 	CONCAT(FilePath, "/", TRIM(TRAILING ".tpl" FROM FileName)) AS Value
 																		FROM ' . TABLE_PREFIX . 'ThemeFiles AS tf
-																		LEFT JOIN ' . TABLE_PREFIX . 'Theme AS t ON t.ThemeId = tf.ThemeId
+																		LEFT JOIN ' . TABLE_PREFIX . 'Themes AS t ON t.ThemeId = tf.ThemeId
 																		WHERE (t.Enabled = 1) AND (tf.FileName NOT LIKE "%%.elm.tpl") AND (tf.FileName NOT LIKE "%%.des.tpl") AND (tf.FilePath = "/designs")',
 				'option_key_field' => 'Value', 'option_title_field' => 'Title',
 				'not_null' => 1, 'default' => CATEGORY_TEMPLATE_INHERIT