Index: branches/5.2.x/install/english.lang =================================================================== diff -u -N -r14741 -r14960 --- branches/5.2.x/install/english.lang (.../english.lang) (revision 14741) +++ branches/5.2.x/install/english.lang (.../english.lang) (revision 14960) @@ -50,7 +50,6 @@ VmlldyBUb3BpYyBSZXBseQ== Q29tbWVudCBUb3BpYw== VmlldyBUb3BpYw== - TmV3IHBvc3RzIChkYXlzKQ== TnVtYmVyIG9mIHBvc3RzIHBlciBwYWdl UG9zdHM= QWN0aXZlIFRvcGljcw== @@ -140,4 +139,4 @@ U3ViamVjdDogVG9waWMgTW9kaWZpY2F0aW9ucyAiPGlucDI6YmJfRmllbGQgbmFtZT0iVG9waWNUZXh0Ii8+IiBwZW5kaW5nCgpVc2VyIHN1Ym1pdHRlZCB0byB0b3BpYyBtb2RpZmljYXRpb25zIGFuZCBwZW5kaW5nIGZvciBhcHByb3ZhbC48YnI+PGJyPg0KDQpUb3BpYzogPGlucDI6YmJfRmllbGQgbmFtZT0iVG9waWNUZXh0Ii8+ - + \ No newline at end of file Index: branches/5.2.x/install/install_data.sql =================================================================== diff -u -N -r14741 -r14960 --- branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14741) +++ branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14960) @@ -1,6 +1,4 @@ # Section "in-bulletin:configuration_output": -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_Highlight_OpenTag', '', 'In-Bulletin', 'in-bulletin:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_Highlight_CloseTag', '', 'In-Bulletin', 'in-bulletin:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortOrder', 'desc', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 10.01, 2, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortField', 'LastPostDate', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield_prompt', 'select', '', 'TopicText=la_opt_TopicText||Posts=la_opt_NumberOfPosts||CreatedOn=la_opt_CreatedOn||LastPostDate=la_opt_LastUpdated||Views=la_opt_TopicViews||CachedRating=la_opt_Rating||LastPoser=la_opt_LastPoster||SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM CustomField WHERE (Type = 3) AND (IsSystem = 0)', 10.01, 1, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortOrder2', 'desc', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield2_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 10.02, 2, 1, NULL); @@ -18,7 +16,6 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'topic_RatingDelay_Value', '1', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.11, 1, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AutoTopicLockPosts', '0', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_prompt_PostsToLock', 'text', NULL, NULL, 10.12, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Postings', '25', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_posts_subheading', 'la_posts_perpage_prompt', 'text', '', '', 20.01, 0, 1, NULL); -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/topics/topic_detail', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 40.02, 0, 0, NULL); Index: branches/5.2.x/install/upgrades.sql =================================================================== diff -u -N -r14741 -r14960 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14741) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14960) @@ -244,4 +244,10 @@ WHERE DisplayName IN ( 'lu_field_notifyowneronchanges', 'lu_field_topicid', 'lu_field_ownerid', 'lu_field_topictext', 'lu_field_postedby', 'lu_field_lastpostid' -); \ No newline at end of file +); + +DELETE FROM Phrase +WHERE PhraseKey IN ('LA_POSTS_NEWDAYS_PROMPT'); + +DELETE FROM ConfigurationValues +WHERE VariableName IN ('Topic_Highlight_OpenTag', 'Topic_Highlight_CloseTag', 'Posts_NewDays');