Index: branches/5.2.x/admin_templates/polls/comment_edit.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/polls/comment_edit.tpl	(.../comment_edit.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/polls/comment_edit.tpl	(.../comment_edit.tpl)	(revision 14088)
@@ -79,15 +79,15 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="poll-comment" field="PollId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="poll-comment" field="CommentId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="poll-comment" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="poll-comment" field="CommentBody" title="!la_fld_PollComment!" control_options="{min_height: 100}" cols="70" rows="5"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="!la_fld_PollGuestName!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestEmail" title="!la_fld_PollGuestEmail!" size="40"/>
+			<inp2:m_RenderElement name="inp_label" prefix="poll-comment" field="CommentId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="poll-comment" field="CreatedById" title="la_fld_CreatedById" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="poll-comment" field="CommentBody" title="la_fld_PollComment" control_options="{min_height: 100}" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="la_fld_PollGuestName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestEmail" title="la_fld_PollGuestEmail" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="poll-comment" field="CreatedOn" title="la_fld_CreatedOn"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="Priority" title="la_fld_Priority" size="5"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="poll-comment" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.2.x/admin_templates/topics/review_edit.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/topics/review_edit.tpl	(.../review_edit.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/topics/review_edit.tpl	(.../review_edit.tpl)	(revision 14088)
@@ -42,17 +42,17 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Review!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Review"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-rev" field="ItemId"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="bb-rev" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_label" prefix="bb-rev" field="ReviewId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="bb-rev" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb-rev" field="ReviewText" title="!la_fld_ReviewText!" cols="70" rows="8"/>
+			<inp2:m_RenderElement name="inp_label" prefix="bb-rev" field="ReviewId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="bb-rev" field="CreatedById" title="la_fld_CreatedById" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb-rev" field="ReviewText" title="la_fld_ReviewText" cols="70" rows="8"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_Text_General!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb-rev" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-rev" field="Priority" title="!la_fld_Priority!" size="3" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb-rev" field="CreatedOn" title="!la_fld_CreatedOn!" size="20" class="text"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_General"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb-rev" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-rev" field="Priority" title="la_fld_Priority" size="3" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb-rev" field="CreatedOn" title="la_fld_CreatedOn" size="20" class="text"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.2.x/admin_templates/topics/images_edit.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/topics/images_edit.tpl	(.../images_edit.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/topics/images_edit.tpl	(.../images_edit.tpl)	(revision 14088)
@@ -31,22 +31,22 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Image"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="bb-img" field="ImageId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="bb-img" field="ImageId" title="la_fld_Id"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="AltName" title="la_fld_AltValue" size="40"/>
 
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="Priority" title="la_fld_Priority" size="5"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_ThumbnailImage"/>
 			<inp2:m_RenderElement name="thumbnail_section" prefix="bb-img"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_FullSizeImage"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
 			<inp2:m_RenderElement name="fullsize_section" prefix="bb-img"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.2.x/admin_templates/topics/topics_images.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/topics/topics_images.tpl	(.../topics_images.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/topics/topics_images.tpl	(.../topics_images.tpl)	(revision 14088)
@@ -99,7 +99,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="bb-img" IdField="ImageId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="bb-img" IdField="ImageId" grid="Default"/>
 <script type="text/javascript">
 	Grids['bb-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') );
 </script>
Index: branches/5.2.x/admin_templates/topics/relations_edit.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/topics/relations_edit.tpl	(.../relations_edit.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/topics/relations_edit.tpl	(.../relations_edit.tpl)	(revision 14088)
@@ -31,17 +31,17 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Relation!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Relation"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-rel" field="SourceId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-rel" field="SourceType"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-rel" field="TargetId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-rel" field="TargetType"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="bb-rel" field="RelationshipId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_relation" prefix="bb-rel" field="TargetId" title="!la_fld_TargetId!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb-rel" field="Type" title="!la_fld_RelationshipType!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-rel" field="Enabled" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="bb-rel" field="RelationshipId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_relation" prefix="bb-rel" field="TargetId" title="la_fld_TargetId"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb-rel" field="Type" title="la_fld_RelationshipType"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-rel" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-rel" field="Priority" title="la_fld_Priority" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.2.x/units/poll_comments/poll_comments_config.php
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/units/poll_comments/poll_comments_config.php	(.../poll_comments_config.php)	(revision 13839)
+++ branches/5.2.x/units/poll_comments/poll_comments_config.php	(.../poll_comments_config.php)	(revision 14088)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_comments_config.php 13577 2010-05-19 07:24:12Z alex $
+* @version	$Id: poll_comments_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
@@ -64,7 +64,7 @@
 		    						'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' => 'Login',
-		    						'required' => 1, 'not_null' => 1, 'default' => USER_GUEST),
+		    						'required' => 1, 'default' => NULL),
 		    'GuestName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		    'GuestEmail' => Array('type' => 'string', 'max_len' => 255, 'formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'not_null' => '1', 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!'),'required' => 0 ),
 		    'CommentBody' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL, 'required' => 1),
Index: branches/5.2.x/admin_templates/topics/topics_categories.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/topics/topics_categories.tpl	(.../topics_categories.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/topics/topics_categories.tpl	(.../topics_categories.tpl)	(revision 14088)
@@ -73,7 +73,7 @@
 </table>
 
 <inp2:m_DefineElement name="grid_checkbox_category_td">
-	<inp2:CategoryName field="$field" primary_title="!la_PrimaryCategory!" no_special="1"/>
+	<inp2:CategoryName field="$field" primary_title="la_PrimaryCategory" no_special="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="bb-ci" IdField="CategoryId" grid="Default"/>
Index: branches/5.2.x/units/posts/posts_config.php
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/units/posts/posts_config.php	(.../posts_config.php)	(revision 13839)
+++ branches/5.2.x/units/posts/posts_config.php	(.../posts_config.php)	(revision 14088)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: posts_config.php 13577 2010-05-19 07:24:12Z alex $
+* @version	$Id: posts_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
@@ -99,7 +99,7 @@
 			'DisableBBCodes' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0),
 			'DisableSmileys' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0),
 			'ShowSignatures' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 1),
-
+			'UserName'		 =>	Array ('type' => 'string', 'default' => ''),
 			// for avatar image
 			'AltName'		=>	Array('type' => 'string', 'default' => ''),
 			'SameImages'	=>	Array('type' => 'string', 'default' => ''),
Index: branches/5.2.x/install/upgrades.php
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 13839)
+++ branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14088)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 13776 2010-06-15 20:28:34Z alex $
+* @version	$Id: upgrades.php 14088 2010-11-26 22:11:10Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -44,6 +44,10 @@
 				'5.1.0-B2' => Array ('Core' => '5.1.0-B2'),
 				'5.1.0-RC1' => Array ('Core' => '5.1.0-RC1'),
 				'5.1.0' => Array ('Core' => '5.1.0'),
+				'5.1.1-B1' => Array ('Core' => '5.1.1-B1'),
+				'5.1.1-B2' => Array ('Core' => '5.1.1-B2'),
+				'5.1.1-RC1' => Array ('Core' => '5.1.1-RC1'),
+				'5.1.1' => Array ('Core' => '5.1.1'),
 			);
 		}
 
Index: branches/5.2.x/install/install_schema.sql
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/install/install_schema.sql	(.../install_schema.sql)	(revision 13839)
+++ branches/5.2.x/install/install_schema.sql	(.../install_schema.sql)	(revision 14088)
@@ -34,8 +34,8 @@
   EditorsPick tinyint(4) NOT NULL DEFAULT '0',
   `Status` tinyint(4) unsigned NOT NULL DEFAULT '2',
   Priority int(11) NOT NULL DEFAULT '0',
-  OwnerId int(11) NOT NULL DEFAULT '-1',
-  ModifiedById int(11) NOT NULL DEFAULT '0',
+  OwnerId int(11) DEFAULT NULL,
+  ModifiedById int(11) DEFAULT NULL,
   ResourceId int(11) DEFAULT NULL,
   TopicType int(11) NOT NULL DEFAULT '1',
   CreatedOn int(11) DEFAULT NULL,
@@ -167,7 +167,7 @@
   CommentId int(11) NOT NULL AUTO_INCREMENT,
   PollId int(11) NOT NULL DEFAULT '0',
   AnswerId int(11) DEFAULT NULL,
-  CreatedById int(11) NOT NULL DEFAULT '-2',
+  CreatedById int(11) DEFAULT NULL,
   GuestName varchar(255) NOT NULL DEFAULT '',
   GuestEmail varchar(255) NOT NULL DEFAULT '',
   CommentBody text,
Index: branches/5.2.x/admin_templates/topics/topics_relations.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/topics/topics_relations.tpl	(.../topics_relations.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/topics/topics_relations.tpl	(.../topics_relations.tpl)	(revision 14088)
@@ -92,7 +92,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="bb-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="bb-rel" IdField="RelationshipId" grid="Default"/>
 <script type="text/javascript">
 	Grids['bb-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
 </script>
Index: branches/5.2.x/units/topics/topics_config.php
===================================================================
diff -u -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),
Index: branches/5.2.x/units/private_messages/private_messages_config.php
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/units/private_messages/private_messages_config.php	(.../private_messages_config.php)	(revision 13839)
+++ branches/5.2.x/units/private_messages/private_messages_config.php	(.../private_messages_config.php)	(revision 14088)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_messages_config.php 13577 2010-05-19 07:24:12Z alex $
+* @version	$Id: private_messages_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
@@ -96,7 +96,9 @@
 
 		'VirtualFields' => Array (
 			'FromName' => Array ('type' => 'string', 'default' => ''),
+			'FromFullName' => Array ('type' => 'string', 'default' => ''),
 			'ToName' => Array ('type' => 'string', 'default' => ''),
+			'ToFullName' => Array ('type' => 'string', 'default' => ''),
 			'Subject' => Array ('type' => 'string', 'default' => ''),
 			'Body' => Array ('type' => 'string',  'required' => 1, 'default' => ''),
 			'Options' => Array ('type' => 'string', 'default' => 0),
Index: branches/5.2.x/units/poll_answers/poll_answers_config.php
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/units/poll_answers/poll_answers_config.php	(.../poll_answers_config.php)	(revision 13839)
+++ branches/5.2.x/units/poll_answers/poll_answers_config.php	(.../poll_answers_config.php)	(revision 14088)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_answers_config.php 13155 2010-02-23 20:10:29Z alex $
+* @version	$Id: poll_answers_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
@@ -37,7 +37,8 @@
 		'AutoDelete' => true,
 		'AutoClone' => true,
 
-		'StatusField'	=>	Array('Status'),
+		'TitleField' => 'Answer',
+		'StatusField' => Array ('Status'),
 
 		// key - special, value - list select sql
 		'ListSQLs' => Array (
Index: branches/5.2.x/admin_templates/topics/topics_reviews.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/topics/topics_reviews.tpl	(.../topics_reviews.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/topics/topics_reviews.tpl	(.../topics_reviews.tpl)	(revision 14088)
@@ -106,7 +106,7 @@
 	<inp2:Field field="$field" no_special="no_special" cut_first="100"/>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="bb-rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="bb-rev" IdField="ReviewId" grid="Default"/>
 <script type="text/javascript">
 	Grids['bb-rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
 </script>
Index: branches/5.2.x/install/english.lang
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/install/english.lang	(.../english.lang)	(revision 13839)
+++ branches/5.2.x/install/english.lang	(.../english.lang)	(revision 14088)
@@ -109,6 +109,7 @@
 			<PHRASE Label="la_title_In-Bulletin" Module="In-Bulletin" Type="1">VG9waWNz</PHRASE>
 			<PHRASE Label="la_title_NewPoll" Module="In-Bulletin" Type="1">TmV3IFBvbGw=</PHRASE>
 			<PHRASE Label="la_title_NewTopic" Module="In-Bulletin" Type="1">TmV3IFRvcGlj</PHRASE>
+			<PHRASE Label="la_title_New_Answer" Module="In-Bulletin" Type="1">TmV3IEFuc3dlcg==</PHRASE>
 			<PHRASE Label="la_title_PollAnswers" Module="In-Bulletin" Type="1">UG9sbCBBbnN3ZXJz</PHRASE>
 			<PHRASE Label="la_title_PollComments" Module="In-Bulletin" Type="1">VXNlciBDb21tZW50cw==</PHRASE>
 			<PHRASE Label="la_title_Polls" Module="In-Bulletin" Type="1">UG9sbHM=</PHRASE>
Index: branches/5.2.x/admin_templates/topics/topics_edit.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/topics/topics_edit.tpl	(.../topics_edit.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/topics/topics_edit.tpl	(.../topics_edit.tpl)	(revision 14088)
@@ -58,34 +58,34 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Topic!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="bb" field="TopicId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Topic"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="bb" field="TopicId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="TopicText" title="la_fld_Subject" size="70"/>
 
 			<inp2:m_if check="bb_FieldEquals" name="Posts" value="0">
 				<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb" field="PostingText" title="la_fld_MessageBody" control_options="{min_height: 100}" cols="70" rows="8"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_user" prefix="bb" field="OwnerId" title="!la_fld_PostedBy!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="bb" field="OwnerId" title="la_fld_PostedBy" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="bb" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="TopicType" title="!la_fld_TopicType!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="NewItem" title="!la_fld_New!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="HotItem" title="!la_fld_Hot!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="PopItem" title="!la_fld_Pop!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb" field="EditorsPick" title="!la_fld_EditorsPick!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="Priority" title="!la_fld_Priority!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb" field="CreatedOn" title="!la_fld_CreatedOn!"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb" field="Modified" title="!la_fld_Modified!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="TopicType" title="la_fld_TopicType"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="NewItem" title="la_fld_New"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="HotItem" title="la_fld_Hot"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="PopItem" title="la_fld_Pop"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb" field="EditorsPick" title="la_fld_EditorsPick"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="Priority" title="la_fld_Priority" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb" field="CreatedOn" title="la_fld_CreatedOn"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb" field="Modified" title="la_fld_Modified"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="MetaKeywords" title="la_fld_MetaKeywords" size="70"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb" field="MetaDescription" title="la_fld_MetaDescription" control_options="{min_height: 100}" cols="70" rows="8"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Counters!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="CachedRating" title="!la_fld_Rating!" hint_label="la_prompt_RatingLimits" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="CachedVotesQty" title="!la_fld_Votes!" hint_label="la_prompt_VoteLimits" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="Views" title="!la_fld_Views!" hint_label="la_prompt_HitLimits" size="4"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Counters"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="CachedRating" title="la_fld_Rating" hint_label="la_prompt_RatingLimits" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="CachedVotesQty" title="la_fld_Votes" hint_label="la_prompt_VoteLimits" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="Views" title="la_fld_Views" hint_label="la_prompt_HitLimits" size="4"/>
 			<input type="hidden" name="Views_original" id="Views_original" value="<inp2:bb_Field name="Views" db="db" />" />
 
 		<!-- custom fields: begin -->
Index: branches/5.2.x/admin_templates/polls/poll_edit.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/polls/poll_edit.tpl	(.../poll_edit.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/polls/poll_edit.tpl	(.../poll_edit.tpl)	(revision 14088)
@@ -81,26 +81,26 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
-			<inp2:m_RenderElement name="inp_label" prefix="poll" field="PollId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Name" title="!la_fld_Name!" size="50"/>
+			<inp2:m_RenderElement name="inp_label" prefix="poll" field="PollId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Name" title="la_fld_Name" size="50"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll" field="Question" title="!la_fld_Question!" control_options="{min_height: 100}" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll" field="Question" title="la_fld_Question" control_options="{min_height: 100}" cols="70" rows="5"/>
 
 			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="poll" field="Image" title="la_fld_Image"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
 
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="poll" field="CreatedOn" title="la_fld_CreatedOn"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="poll" field="StartDate" title="la_fld_StartDate"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="poll" field="EndDate" title="la_fld_EndDate"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Priority" title="!la_fld_Priority!" size="5"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="RequireLogin" title="!la_fld_RequireLogin!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="AllowComments" title="!la_fld_AllowComments!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="AllowMultipleVotings" title="!la_fld_AllowMultipleVotings!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="CachedVotesQty" title="!la_fld_Votes!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Priority" title="la_fld_Priority" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="RequireLogin" title="la_fld_RequireLogin"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="AllowComments" title="la_fld_AllowComments"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="AllowMultipleVotings" title="la_fld_AllowMultipleVotings"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="CachedVotesQty" title="la_fld_Votes" size="5"/>
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="poll" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
Index: branches/5.2.x/admin_templates/polls/answer_edit.tpl
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/admin_templates/polls/answer_edit.tpl	(.../answer_edit.tpl)	(revision 13839)
+++ branches/5.2.x/admin_templates/polls/answer_edit.tpl	(.../answer_edit.tpl)	(revision 14088)
@@ -81,13 +81,13 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="poll-answer" field="PollId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="poll-answer" field="AnswerId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll-answer" field="Answer" title="!la_fld_PollAnswer!" control_options="{min_height: 100}" cols="70" rows="5"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-answer" field="Priority" title="!la_fld_Priority!" size="5"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-answer" field="VotesQty" title="!la_fld_Votes!" size="5"/>
+			<inp2:m_RenderElement name="inp_label" prefix="poll-answer" field="AnswerId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll-answer" field="Answer" title="la_fld_PollAnswer" control_options="{min_height: 100}" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-answer" field="Priority" title="la_fld_Priority" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-answer" field="VotesQty" title="la_fld_Votes" size="5"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="poll-answer" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.2.x/install/upgrades.sql
===================================================================
diff -u -r13839 -r14088
--- branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13839)
+++ branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14088)
@@ -199,4 +199,19 @@
 
 # ===== v 5.1.0-RC1 =====
 
-# ===== v 5.1.0 =====
\ No newline at end of file
+# ===== v 5.1.0 =====
+
+# ===== v 5.1.1-B1 =====
+ALTER TABLE PollsComments CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE Topic
+	CHANGE OwnerId OwnerId INT( 11 ) NULL DEFAULT NULL ,
+	CHANGE ModifiedById ModifiedById INT( 11 ) NULL DEFAULT NULL;
+
+UPDATE Topic SET ModifiedById = NULL WHERE ModifiedById = 0;
+
+# ===== v 5.1.1-B2 =====
+
+# ===== v 5.1.1-RC1 =====
+
+# ===== v 5.1.1 =====
\ No newline at end of file