Index: branches/5.2.x/units/censorship/censorship_config.php
===================================================================
diff -u -N -r14252 -r14581
--- branches/5.2.x/units/censorship/censorship_config.php	(.../censorship_config.php)	(revision 14252)
+++ branches/5.2.x/units/censorship/censorship_config.php	(.../censorship_config.php)	(revision 14581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: censorship_config.php 14252 2011-03-16 21:26:29Z alex $
+* @version	$Id: censorship_config.php 14581 2011-09-23 14:27:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -87,9 +87,9 @@
 					'module' => 'core',
 				),
 				'Fields' => Array (
-					'CensorshipId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',  'width' => 50),
-					'BadWord' => Array ('title' => 'la_col_BadWord', 'filter_block' => 'grid_like_filter', 'width' => 250),
-					'Replacement' => Array ('title' => 'la_col_Replacement', 'filter_block' => 'grid_like_filter', 'width' => 250),
+					'CensorshipId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',  'width' => 50),
+					'BadWord' => Array ('filter_block' => 'grid_like_filter', 'width' => 250),
+					'Replacement' => Array ('filter_block' => 'grid_like_filter', 'width' => 250),
 				),
 			),
 		),
Index: branches/5.2.x/units/poll_answers/poll_answers_config.php
===================================================================
diff -u -N -r14252 -r14581
--- branches/5.2.x/units/poll_answers/poll_answers_config.php	(.../poll_answers_config.php)	(revision 14252)
+++ branches/5.2.x/units/poll_answers/poll_answers_config.php	(.../poll_answers_config.php)	(revision 14581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_answers_config.php 14252 2011-03-16 21:26:29Z alex $
+* @version	$Id: poll_answers_config.php 14581 2011-09-23 14:27:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -52,7 +52,7 @@
 		'ListSortings' => Array (
 			'' => Array(
 				'ForcedSorting' => Array('Priority' => 'desc'),
-				'Sorting' => Array('Answer' => 'ASC'),
+				'Sorting' => Array('Answer' => 'asc'),
 			)
 		),
 
@@ -75,9 +75,9 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'AnswerId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Answer' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+								'AnswerId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'Answer' => Array ('data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
 								'VotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 
 							),
Index: branches/5.2.x/units/topics/topics_config.php
===================================================================
diff -u -N -r14568 -r14581
--- branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 14568)
+++ branches/5.2.x/units/topics/topics_config.php	(.../topics_config.php)	(revision 14581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_config.php 14568 2011-09-20 10:02:56Z alex $
+* @version	$Id: topics_config.php 14581 2011-09-23 14:27:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -515,15 +515,15 @@
 								'NEW' => 'icon16_topic_new.png',
 							),
 							'Fields' => Array (
-								'TopicId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'TopicId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'TopicText' => Array ('title' => 'la_col_TopicText', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 300, 'first_chars' => 290, ),
-								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
-								'UserName' => Array ('title' => 'la_col_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-								'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-								'Status' =>	Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+								'UserName' => Array ('title' => 'column:la_fld_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+								'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'Status' =>	Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
 								'LastPostDate' => Array ('title' => 'la_col_LastPostOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
 								'Posts' => Array ('title' => 'la_col_Posts', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'Views' =>	Array ('title' => 'la_col_Views', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Views' =>	Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
 							),
 						),
 
@@ -536,15 +536,15 @@
 								'NEW' => 'icon16_topic_new.png',																		),
 							'Selector' => 'radio',
 							'Fields' => Array (
-								'TopicId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'TopicId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'TopicText' => Array ('title' => 'la_col_TopicText', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 300, 'first_chars' => 290, ),
-								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
-								'UserName' => Array ('title' => 'la_col_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-								'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-								'Status' =>	Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+								'UserName' => Array ('title' => 'column:la_fld_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+								'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'Status' =>	Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
 								'LastPostDate' => Array ('title' => 'la_col_LastPostOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
 								'Posts' => Array ('title' => 'la_col_Posts', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'Views' =>	Array ('title' => 'la_col_Views', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Views' =>	Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
 							),
 						),
 					),
Index: branches/5.2.x/units/emoticons/emoticons_config.php
===================================================================
diff -u -N -r14252 -r14581
--- branches/5.2.x/units/emoticons/emoticons_config.php	(.../emoticons_config.php)	(revision 14252)
+++ branches/5.2.x/units/emoticons/emoticons_config.php	(.../emoticons_config.php)	(revision 14581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: emoticons_config.php 14252 2011-03-16 21:26:29Z alex $
+* @version	$Id: emoticons_config.php 14581 2011-09-23 14:27:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -98,10 +98,10 @@
 					'module' => 'core',
 				),
 				'Fields' => Array (
-					'EmoticonId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
-					'Name' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-					'KeyStroke' => Array ('title' => 'la_col_KeyStroke', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-					'EmotionImage' => Array ('title' => 'la_col_Image', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+					'EmoticonId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+					'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+					'KeyStroke' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+					'EmotionImage' => Array ('title' => 'column:la_fld_Image', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
 				),
 			),
 		),
Index: branches/5.2.x/install/english.lang
===================================================================
diff -u -N -r14568 -r14581
--- branches/5.2.x/install/english.lang	(.../english.lang)	(revision 14568)
+++ branches/5.2.x/install/english.lang	(.../english.lang)	(revision 14581)
@@ -1,37 +1,30 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
 	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
 		<PHRASES>
-			<PHRASE Label="la_col_BadWord" Module="In-Bulletin" Type="1">Q2Vuc29yZWQgV29yZA==</PHRASE>
 			<PHRASE Label="la_col_CommentedByUser" Module="In-Bulletin" Type="1">VXNlcg==</PHRASE>
-			<PHRASE Label="la_col_KeyStroke" Module="In-Bulletin" Type="1">S2V5IFN0cm9rZQ==</PHRASE>
 			<PHRASE Label="la_col_LastPostOn" Module="In-Bulletin" Type="1">TGFzdCBQb3N0IE9u</PHRASE>
 			<PHRASE Label="la_col_ModifiedDate" Module="In-Bulletin" Type="1">RGF0ZS9UaW1l</PHRASE>
 			<PHRASE Label="la_col_NumberOfDaysActive" Module="In-Bulletin" Type="1">RGF5cyBBY3RpdmU=</PHRASE>
-			<PHRASE Label="la_col_PollComment" Module="In-Bulletin" Type="1">Q29tbWVudA==</PHRASE>
-			<PHRASE Label="la_col_PostedBy" Module="In-Bulletin" Type="1">UG9zdGVy</PHRASE>
 			<PHRASE Label="la_col_Posts" Module="In-Bulletin" Type="1">UmVwbGllcw==</PHRASE>
-			<PHRASE Label="la_col_Replacement" Module="In-Bulletin" Type="1">UmVwbGFjZW1lbnQ=</PHRASE>
 			<PHRASE Label="la_col_TopicText" Module="In-Bulletin" Type="1">VG9waWM=</PHRASE>
-			<PHRASE Label="la_col_Views" Module="In-Bulletin" Type="1">Vmlld3M=</PHRASE>
 			<PHRASE Label="la_col_VoteCount" Module="In-Bulletin" Type="1">Vm90ZXM=</PHRASE>
 			<PHRASE Label="la_fld_AllowComments" Module="In-Bulletin" Type="1">QWxsb3cgQ29tbWVudHM=</PHRASE>
 			<PHRASE Label="la_fld_AllowMultipleVotings" Module="In-Bulletin" Type="1">QWxsb3cgTXVsdGlwbGUgVm90aW5ncw==</PHRASE>
-			<PHRASE Label="la_fld_BadWord" Module="In-Bulletin" Type="1">Q2Vuc29yZWQgV29yZA==</PHRASE>
+			<PHRASE Label="la_fld_BadWord" Module="In-Bulletin" Type="1" Column="Q2Vuc29yZWQgV29yZA==">Q2Vuc29yZWQgV29yZA==</PHRASE>
 			<PHRASE Label="la_fld_cust_bb_ItemTemplate" Module="In-Bulletin" Type="1">VG9waWNzIEl0ZW0gVGVtcGxhdGU=</PHRASE>
-			<PHRASE Label="la_fld_EndDate" Module="In-Bulletin" Type="1">RW5kIERhdGU=</PHRASE>
-			<PHRASE Label="la_fld_KeyStroke" Module="In-Bulletin" Type="1">S2V5IFN0cm9rZQ==</PHRASE>
+			<PHRASE Label="la_fld_EndDate" Module="In-Bulletin" Type="1" Column="RW5kIERhdGU=">RW5kIERhdGU=</PHRASE>
+			<PHRASE Label="la_fld_KeyStroke" Module="In-Bulletin" Type="1" Column="S2V5IFN0cm9rZQ==">S2V5IFN0cm9rZQ==</PHRASE>
 			<PHRASE Label="la_fld_PollAnswer" Module="In-Bulletin" Type="1">QW5zd2Vy</PHRASE>
-			<PHRASE Label="la_fld_PollComment" Module="In-Bulletin" Type="1">Q29tbWVudA==</PHRASE>
+			<PHRASE Label="la_fld_PollComment" Module="In-Bulletin" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
 			<PHRASE Label="la_fld_PollGuestEmail" Module="In-Bulletin" Type="1">R3Vlc3QgRW1haWw=</PHRASE>
 			<PHRASE Label="la_fld_PollGuestName" Module="In-Bulletin" Type="1">R3Vlc3QgTmFtZQ==</PHRASE>
-			<PHRASE Label="la_fld_PostedBy" Module="In-Bulletin" Type="1">UG9zdGVkIEJ5</PHRASE>
+			<PHRASE Label="la_fld_PostedBy" Module="In-Bulletin" Type="1" Column="UG9zdGVy">UG9zdGVkIEJ5</PHRASE>
 			<PHRASE Label="la_fld_Question" Module="In-Bulletin" Type="1">UXVlc3Rpb24=</PHRASE>
-			<PHRASE Label="la_fld_RequireLogin" Module="In-Bulletin" Type="1">UmVxdWlyZSBMb2dpbg==</PHRASE>
 			<PHRASE Label="la_fld_TopicType" Module="In-Bulletin" Type="1">VG9waWMgTG9ja2Vk</PHRASE>
 			<PHRASE Label="la_fld_Topic_MaxHotNumber" Module="In-Bulletin" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIHRvcGljcw==</PHRASE>
 			<PHRASE Label="la_fld_Topic_MinPopRating" Module="In-Bulletin" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgdG9waWMgUE9Q</PHRASE>
 			<PHRASE Label="la_fld_Topic_MinPopVotes" Module="In-Bulletin" Type="1">TWluaW11bSBudW1iZXIgb2YgcG9zdHMgdG8gY29uc2lkZXIgdG9waWMgUE9Q</PHRASE>
-			<PHRASE Label="la_fld_Views" Module="In-Bulletin" Type="1">Vmlld3M=</PHRASE>
+			<PHRASE Label="la_fld_Views" Module="In-Bulletin" Type="1" Column="Vmlld3M=">Vmlld3M=</PHRASE>
 			<PHRASE Label="la_In-bulletin" Module="In-Bulletin" Type="1">SW4tQnVsbGV0aW4=</PHRASE>
 			<PHRASE Label="la_ItemTab_Topics" Module="In-Bulletin" Type="1">VG9waWNz</PHRASE>
 			<PHRASE Label="la_opt_LastPoster" Module="In-Bulletin" Type="1">TGFzdCBQb3N0ZXI=</PHRASE>
Index: branches/5.2.x/units/polls/polls_config.php
===================================================================
diff -u -N -r14252 -r14581
--- branches/5.2.x/units/polls/polls_config.php	(.../polls_config.php)	(revision 14252)
+++ branches/5.2.x/units/polls/polls_config.php	(.../polls_config.php)	(revision 14581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: polls_config.php 14252 2011-03-16 21:26:29Z alex $
+* @version	$Id: polls_config.php 14581 2011-09-23 14:27:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -178,12 +178,12 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'PollId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Name' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-								'StartDate' => Array ('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 145,  ),
-								'EndDate' => Array ('title' => 'la_col_EndDate', 'data_block' => 'poll_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'PollId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'Name' => Array ('data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+								'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145,  ),
+								'EndDate' => Array ('data_block' => 'poll_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
 								'CachedVotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
 //								'DaysActive' => Array ('title' => 'la_col_NumberOfDaysActive', 'filter_block' => 'grid_range_filter',),
 							),
 						),
Index: branches/5.2.x/install/install_data.sql
===================================================================
diff -u -N -r14568 -r14581
--- branches/5.2.x/install/install_data.sql	(.../install_data.sql)	(revision 14568)
+++ branches/5.2.x/install/install_data.sql	(.../install_data.sql)	(revision 14581)
@@ -21,7 +21,7 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Posts_NewDays', '5', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_posts_subheading', 'la_posts_newdays_prompt', 'text', '', '', 20.02, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_TopicReviews', '10', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 30.01, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_CategoryTemplate', '/in-bulletin/designs/section', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 40.01, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_ItemTemplate', 'in-bulletin/designs/detail', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 40.02, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_ItemTemplate', 'in-bulletin/topics/topic_detail', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 40.02, 0, 0, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_MaxImageCount', '5', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 50.01, 0, 0, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_ThumbnailImageWidth', '120', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 50.02, 0, 0, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_ThumbnailImageHeight', '120', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 50.03, 0, 0, NULL);
@@ -226,4 +226,4 @@
 
 INSERT INTO CustomField VALUES (DEFAULT, 1, 'bb_ItemTemplate', 'la_fld_cust_bb_ItemTemplate', 0, 'la_title_SystemCF', 'la_fld_cust_bb_ItemTemplate', 'text', NULL, '', 0, 0, 1, 0);
 
-INSERT INTO Modules VALUES ('In-Bulletin', 'modules/in-bulletin/', 'bb', DEFAULT, 1, 3, 'in-bulletin/', {TopicCatId}, NULL);
+INSERT INTO Modules VALUES ('In-Bulletin', 'modules/in-bulletin/', 'bb', DEFAULT, 1, 3, 'in-bulletin/', {TopicCatId}, NULL, NULL);
Index: branches/5.2.x/units/poll_comments/poll_comments_config.php
===================================================================
diff -u -N -r14252 -r14581
--- branches/5.2.x/units/poll_comments/poll_comments_config.php	(.../poll_comments_config.php)	(revision 14252)
+++ branches/5.2.x/units/poll_comments/poll_comments_config.php	(.../poll_comments_config.php)	(revision 14581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_comments_config.php 14252 2011-03-16 21:26:29Z alex $
+* @version	$Id: poll_comments_config.php 14581 2011-09-23 14:27:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -85,12 +85,6 @@
 			),
 		),
 
-		'ConfigMapping' => Array (
-			'PerPage'				=>	'poll_Perpage_Comments',
-			'CommentDelayInterval'	=>	'poll_CommentDelay_Value',
-			'CommentDelayValue'		=>	'poll_CommentDelay_Interval',
-		),
-
 		'Grids' => Array (
 						'Default' => Array (
 							'Icons' => Array (
@@ -101,13 +95,13 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'CommentId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'CommentBody' => Array ('title' => 'la_col_PollComment', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+								'CommentId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'CommentBody' => Array ('title' => 'column:la_fld_PollComment', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
 
 								'CommentedByUser' => Array( 'title'=>'la_col_CommentedByUser', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
 
-								'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145,  ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+								'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145,  ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
 							),
 						),
 		),
Index: branches/5.2.x/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r14252 -r14581
--- branches/5.2.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 14252)
+++ branches/5.2.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 14581)
@@ -39,7 +39,8 @@
 			Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true);
 		</inp2:m_if>
 		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
-		$Catalog.reflectPasteButton(<inp2:c_HasClipboard/>);
+		<inp2:m_RenderElement name="reflect_catalog_buttons"/>
+
 		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
 		<inp2:m_if check="m_ParamEquals" name="tab_mode" value="single">
 			Grids['<inp2:m_param name="prefix"/>'].DblClick = function() {return false};
Index: branches/5.2.x/install/upgrades.php
===================================================================
diff -u -N -r14568 -r14581
--- branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14568)
+++ branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 14568 2011-09-20 10:02:56Z alex $
+* @version	$Id: upgrades.php 14581 2011-09-23 14:27:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -51,6 +51,11 @@
 				'5.1.2-B1' => Array ('Core' => '5.1.2-B1'),
 				'5.1.2-RC1' => Array ('Core' => '5.1.2-RC1'),
 				'5.1.2' => Array ('Core' => '5.1.2'),
+				'5.1.3-B1' => Array ('Core' => '5.1.3-B1'),
+				'5.1.3-B2' => Array ('Core' => '5.1.3-B2'),
+				'5.1.3-RC1' => Array ('Core' => '5.1.3-RC1'),
+				'5.1.3-RC2' => Array ('Core' => '5.1.3-RC2'),
+				'5.1.3' => Array ('Core' => '5.1.3'),
 			);
 		}
 
Index: branches/5.2.x/admin_templates/topics/topics_custom.tpl
===================================================================
diff -u -N -r14252 -r14581
--- branches/5.2.x/admin_templates/topics/topics_custom.tpl	(.../topics_custom.tpl)	(revision 14252)
+++ branches/5.2.x/admin_templates/topics/topics_custom.tpl	(.../topics_custom.tpl)	(revision 14581)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="bb" section="in-portal:browse" grid="SeparateTab" title_preset="topics_custom" tab_preset="Default"/>
+<inp2:m_RenderElement name="combined_header" prefix="bb" section="in-portal:browse" title_preset="topics_custom" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -49,14 +49,24 @@
 			</script>
 		</td>
 
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="SeparateTab"/>
+		<inp2:m_RenderElement name="ml_selector" prefix="bb"/>
 	</tr>
 </tbody>
 </table>
 
+<inp2:bb_SaveWarning name="grid_save_warning"/>
+<inp2:bb_ErrorWarning name="form_error_warning"/>
+
 <inp2:m_include t="incs/custom_blocks"/>
-<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="bb" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" no_init="no_init"/>
 
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:cf.all_PrintList render_as="cv_row_block" SourcePrefix="bb" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
 <input type="hidden" name="cf_type" value="<inp2:bb_UnitOption name='ItemType'/>"/>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/units/poll_comments/poll_comment_eh.php
===================================================================
diff -u -N -r14252 -r14581
--- branches/5.2.x/units/poll_comments/poll_comment_eh.php	(.../poll_comment_eh.php)	(revision 14252)
+++ branches/5.2.x/units/poll_comments/poll_comment_eh.php	(.../poll_comment_eh.php)	(revision 14581)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_comment_eh.php 14252 2011-03-16 21:26:29Z alex $
+* @version	$Id: poll_comment_eh.php 14581 2011-09-23 14:27:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -139,8 +139,7 @@
 
 				$object =& $event->getObject();
 
-				$config_mapping = $this->Application->getUnitOption($event->Prefix, 'ConfigMapping');
-				$comment_settings = $config_mapping['CommentDelayValue'].':'.$config_mapping['CommentDelayInterval'];
+				$comment_settings = 'poll_CommentDelay_Value:poll_CommentDelay_Interval';
 				$spam_helper->InitHelper($object->GetDBField('PollId'), 'PollComment', $comment_settings);
 				$spam_helper->AddToSpamControl();
 			}
Index: branches/5.2.x/install/upgrades.sql
===================================================================
diff -u -N -r14568 -r14581
--- branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14568)
+++ branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14581)
@@ -220,4 +220,20 @@
 
 # ===== v 5.1.2-RC1 =====
 
-# ===== v 5.1.2 =====
\ No newline at end of file
+# ===== v 5.1.2 =====
+
+# ===== v 5.1.3-B1 =====
+
+# ===== v 5.1.3-B2 =====
+
+# ===== v 5.1.3-RC1 =====
+UPDATE ConfigurationValues
+SET VariableValue = 'in-bulletin/topics/topic_detail'
+WHERE VariableName = 'bb_ItemTemplate' AND VariableValue = 'in-bulletin/designs/detail';
+
+# ===== v 5.1.3-RC2 =====
+
+# ===== v 5.1.3 =====
+UPDATE Phrase
+SET `Module` = 'Core'
+WHERE PhraseKey = 'LA_FLD_REQUIRELOGIN';
\ No newline at end of file