Index: branches/5.2.x/units/topics/topics_config.php
===================================================================
diff -u -N -r13839 -r14088
--- branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 13839)
+++ branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 14088)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_config.php 13744 2010-06-09 17:28:35Z alex $
+* @version	$Id: topics_config.php 14088 2010-11-26 22:11:10Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -243,24 +243,19 @@
 					),
 
 					'FilterMenu'		=>	Array (
-												'Groups' => Array (
-													Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array (
-													'show_active'	=>	Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
-													'show_pending'	=>	Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2'  ),
-													'show_disabled'	=>	Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
-													's1'	=>	Array (),
-													'show_new'	=>	Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
-													'show_hot'	=>	Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
-													'show_pop'	=>	Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
-													'show_pick'	=>	Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
-												)
-											),
+						'Groups' => Array (
+							Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),
+						),
+						'Filters' => Array (
+							'show_new'	=>	Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
+							'show_hot'	=>	Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
+							'show_pop'	=>	Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
+							'show_pick'	=>	Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
+						),
+					),
 
 					'CatalogSelectorName'	=>	'topiclist',
 
@@ -395,7 +390,7 @@
 			            	'left_key_field' => 'PortalUserId',
 			            	'left_title_field' => 'Login',
 			            	'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
-			            	'required' => 1, 'not_null' => 1, 'default' => USER_ROOT,
+			            	'required' => 1, 'default' => NULL,
 						),
 			            'ModifiedById'			=> Array (
 			            	'type' => 'int',
@@ -406,7 +401,7 @@
 			            	'left_key_field' => 'PortalUserId',
 			            	'left_title_field' => 'Login',
 			            	'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
-			            	'required' => 1, 'not_null' => 1, 'default' => USER_ROOT,
+			            	'default' => NULL,
 						),
 			            'ResourceId'			=>	Array ('type' => 'int', 'default' => null),
 			            'TopicType'				=>	Array (
@@ -467,8 +462,11 @@
 							'options' => Array (),
 							'default' => 0,
 						),
-						'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'Filename' => Array ('type' => 'string', 'default' => ''),
+						'CategoryFilename' => Array ('type' => 'string', 'default' => ''),
+						'PrimaryCat' => Array ('type' => 'int', 'default' => 0),
 						'CachedNavbar' => Array ('type' => 'string', 'default' => ''),
+						'ParentPath' => Array ('type' => 'string', 'default' => ''),
 
 						'LastPoster' => Array ('type' => 'string', 'default' => ''),
 						'LastPosterId' => Array ('type' => 'int', 'default' => USER_GUEST),