Browse Source

! [4836] removed even more unused linktree_inline settings from various files

Spuds 12 years ago
parent
commit
1cfecb1bfa

+ 0 - 1
Sources/Display.php

@@ -464,7 +464,6 @@ function Display()
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?topic=' . $topic . '.0',
 		'name' => $topicinfo['subject'],
-		'extra_before' => $settings['linktree_inline'] ? $txt['topic'] . ': ' : ''
 	);
 
 	// Build a list of this board's moderators.

+ 0 - 1
Sources/MoveTopic.php

@@ -108,7 +108,6 @@ function MoveTopic()
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?topic=' . $topic . '.0',
 		'name' => $context['subject'],
-		'extra_before' => $settings['linktree_inline'] ? $txt['topic'] . ': ' : '',
 	);
 
 	$context['linktree'][] = array(

+ 2 - 2
Sources/Post.php

@@ -1039,8 +1039,8 @@ function Post()
 		$context['linktree'][] = array(
 			'url' => $scripturl . '?topic=' . $topic . '.' . $_REQUEST['start'],
 			'name' => $form_subject,
-			'extra_before' => '<span' . ($settings['linktree_inline'] ? ' class="smalltext"' : '') . '><strong class="nav">' . $context['page_title'] . ' ( </strong></span>',
-			'extra_after' => '<span' . ($settings['linktree_inline'] ? ' class="smalltext"' : '') . '><strong class="nav"> )</strong></span>'
+			'extra_before' => '<span><strong class="nav">' . $context['page_title'] . ' ( </strong></span>',
+			'extra_after' => '<span><strong class="nav"> )</strong></span>'
 		);
 
 	// Give wireless a linktree url to the post screen, so that they can switch to full version.

+ 0 - 2
Themes/default/languages/Themes.english.php

@@ -71,8 +71,6 @@ $txt['who_display_viewing_names'] = 'Show member names';
 $txt['disable_recent_posts'] = 'Disable recent posts';
 $txt['enable_single_post'] = 'Enable single post';
 $txt['enable_multiple_posts'] = 'Enable multiple posts';
-$txt['enable_inline_links'] = 'Enable inline links';
-$txt['inline_desc'] = 'Enabling this will cause your current location to be drawn in a single line, as opposed to in a tree-like manner.';
 $txt['show_stats_index'] = 'Show statistics on board index';
 $txt['latest_members'] = 'Show latest member on board index';
 $txt['last_modification'] = 'Show last modification date on modified posts';

+ 0 - 1
other/install_2-1_mysql.sql

@@ -1954,7 +1954,6 @@ VALUES (1, 'name', '{$default_theme_name}'),
 	(1, 'show_profile_buttons', '1'),
 	(1, 'show_mark_read', '1'),
 	(1, 'show_stats_index', '1'),
-	(1, 'linktree_inline', '0'),
 	(1, 'show_board_desc', '1'),
 	(1, 'newsfader_time', '5000'),
 	(1, 'allow_no_censored', '0'),

+ 0 - 1
other/install_2-1_postgresql.sql

@@ -2456,7 +2456,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, 'linktree_inline', '0');
 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, 'allow_no_censored', '0');

+ 0 - 1
other/install_2-1_sqlite.sql

@@ -2104,7 +2104,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, 'linktree_inline', '0');
 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, 'allow_no_censored', '0');

+ 0 - 1
other/upgrade.php

@@ -2035,7 +2035,6 @@ function convertSettingsToTheme()
 		'newsfader_time' => @$GLOBALS['fadertime'],
 		'use_image_buttons' => empty($GLOBALS['MenuType']) ? 1 : 0,
 		'enable_news' => @$GLOBALS['enable_news'],
-		'linktree_inline' => @$modSettings['enableInlineLinks'],
 		'return_to_post' => @$modSettings['returnToPost'],
 	);