Merge pull request #1081 from Arantor/release-2.1

Board descriptions should really be shown inside boards, not just because a user chooses so.

Themes/default/MessageIndex.template.php

@@ -125,13 +125,13 @@ function template_main()
 		', template_button_strip($context['normal_buttons'], 'right'), '
 	</div>';
 
-	if ((!empty($options['show_board_desc']) && $context['description'] != '') || !empty($context['moderators']))
+	if ($context['description'] != '' || !empty($context['moderators']))
 		{
 		echo '
 	<div id="description_board" class="generic_list_wrapper">
 		<h3 class="floatleft">', $context['name'], '&nbsp;-&nbsp;</h3>
 		<p>';
-	if (!empty($options['show_board_desc']) && $context['description'] != '')
+	if ($context['description'] != '')
 	echo '
 		', $context['description'], '&nbsp;';
 

Themes/default/Profile.template.php

@@ -1581,13 +1581,6 @@ function template_profile_theme_settings()
 	global $context, $settings, $options, $scripturl, $modSettings, $txt;
 
 	echo '
-							<dt>
-								<label for="show_board_desc">', $txt['board_desc_inside'], '</label>
-							</dt>
-							<dd>
-								<input type="hidden" name="default_options[show_board_desc]" value="0" />
-								<input type="checkbox" name="default_options[show_board_desc]" id="show_board_desc" value="1"', !empty($context['member']['options']['show_board_desc']) ? ' checked="checked"' : '', ' class="input_check" />
-							</dd>
 							<dt>
 								<label for="show_children">', $txt['show_children'], '</label>
 							</dt>

Themes/default/Settings.template.php

@@ -15,11 +15,6 @@ function template_options()
 	global $context, $settings, $options, $scripturl, $txt;
 
 	$context['theme_options'] = array(
-		array(
-			'id' => 'show_board_desc',
-			'label' => $txt['board_desc_inside'],
-			'default' => true,
-		),
 		array(
 			'id' => 'show_children',
 			'label' => $txt['show_children'],

Themes/default/languages/Profile.english.php

@@ -318,7 +318,6 @@ $txt['timeformat_easy5'] = 'DD-MM-YYYY, HH:MM:SS';
 
 $txt['poster'] = 'Poster';
 
-$txt['board_desc_inside'] = 'Show board descriptions inside boards.';
 $txt['show_children'] = 'Show sub-boards on every page inside boards, not just the first.';
 $txt['show_no_avatars'] = 'Don\'t show users\' avatars.';
 $txt['show_no_signatures'] = 'Don\'t show users\' signatures.';

other/install_2-1_mysql.sql

@@ -2048,7 +2048,6 @@ VALUES (1, 'name', '{$default_theme_name}'),
 	(1, 'show_profile_buttons', '1'),
 	(1, 'show_mark_read', '1'),
 	(1, 'show_stats_index', '1'),
-	(1, 'show_board_desc', '1'),
 	(1, 'newsfader_time', '5000'),
 	(1, 'additional_options_collapsable', '1'),
 	(1, 'use_image_buttons', '1'),

other/install_2-1_postgresql.sql

@@ -2581,7 +2581,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'linktree_
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_mark_read', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_stats_index', '1');
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_board_desc', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'newsfader_time', '5000');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'additional_options_collapsable', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'use_image_buttons', '1');

other/install_2-1_sqlite.sql

@@ -2200,7 +2200,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'linktree_
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_mark_read', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_stats_index', '1');
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_board_desc', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'newsfader_time', '5000');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'additional_options_collapsable', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'use_image_buttons', '1');

other/install_2-1_sqlite3.sql

@@ -2200,7 +2200,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'linktree_
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_mark_read', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_stats_index', '1');
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_board_desc', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'newsfader_time', '5000');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'additional_options_collapsable', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'use_image_buttons', '1');

other/upgrade.php

@@ -2070,7 +2070,6 @@ function convertSettingsToTheme()
 		'linktree_link' => @$GLOBALS['curposlinks'],
 		'show_profile_buttons' => @$GLOBALS['profilebutton'],
 		'show_mark_read' => @$GLOBALS['showmarkread'],
-		'show_board_desc' => @$GLOBALS['ShowBDescrip'],
 		'newsfader_time' => @$GLOBALS['fadertime'],
 		'use_image_buttons' => empty($GLOBALS['MenuType']) ? 1 : 0,
 		'enable_news' => @$GLOBALS['enable_news'],

other/upgrade_2-1_mysql.sql

@@ -556,6 +556,11 @@ DELETE FROM {$db_prefix}settings
 WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration');
 ---#
 
+---# Cleaning up old theme settings.
+DELETE FROM {$db_prefix}themes
+WHERE variable IN ('show_board_desc');
+---#
+
 /******************************************************************************/
 --- Removing old Simple Machines files we do not need to fetch any more
 /******************************************************************************/

other/upgrade_2-1_postgresql.sql

@@ -636,6 +636,11 @@ DELETE FROM {$db_prefix}settings
 WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration');
 ---#
 
+---# Cleaning up old theme settings.
+DELETE FROM {$db_prefix}themes
+WHERE variable IN ('show_board_desc');
+---#
+
 /******************************************************************************/
 --- Removing old Simple Machines files we do not need to fetch any more
 /******************************************************************************/

other/upgrade_2-1_sqlite.sql

@@ -627,6 +627,11 @@ DELETE FROM {$db_prefix}settings
 WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration');
 ---#
 
+---# Cleaning up old theme settings.
+DELETE FROM {$db_prefix}themes
+WHERE variable IN ('show_board_desc');
+---#
+
 /******************************************************************************/
 --- Removing old Simple Machines files we do not need to fetch any more
 /******************************************************************************/