From aadd16aab1f00d6f53304dac1333cf81426ad5fa Mon Sep 17 00:00:00 2001
From: tonythomas01 <01tonythomas@gmail.com>
Date: Thu, 5 Dec 2013 23:24:27 +0530
Subject: [PATCH] Remove preference "Show table of contents (for pages with
 more ...)"

The table of contents box is auto-inserted, can trivially be hidden or
exposed on a per-page basis with __MAGICWORDS__, includes a sticky
[show|hide] link, and can be easily hidden with site-wide CSS as
necessary. It needlessly adds complexity and user interface clutter.

Bug: 52813
Change-Id: If2139317dae4aa980b373c73d7b81dac627b5af8
---
 RELEASE-NOTES-1.23                                         | 2 ++
 includes/DefaultSettings.php                               | 1 -
 includes/Preferences.php                                   | 7 -------
 .../resourceloader/ResourceLoaderUserCSSPrefsModule.php    | 3 ---
 languages/messages/MessagesEn.php                          | 1 -
 maintenance/language/messages.inc                          | 1 -
 6 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index b80a9a9ce7..fdefa0b4d8 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -191,6 +191,8 @@ changes to languages because of Bugzilla reports.
    interface).
 * Option to mark hooks as deprecated has been added.
 * (bug 52811) Preference "Enable section editing via [edit] links" was removed.
+* (bug 52813) Preference "Show table of contents (for pages with more than
+  3 headings)" was removed.
 
 ==== Removed classes ====
 * FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 09f30a4072..92649475ae 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4005,7 +4005,6 @@ $wgDefaultUserOptions = array(
 	'rows' => 25,
 	'showhiddencats' => 0,
 	'shownumberswatching' => 1,
-	'showtoc' => 1,
 	'showtoolbar' => 1,
 	'skin' => false,
 	'stubthreshold' => 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 8d6ee5924f..04e9114835 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -755,13 +755,6 @@ class Preferences {
 			'label-raw' => $context->msg( 'stub-threshold' )->text(), // Raw HTML message. Yay?
 		);
 
-		if ( $wgAllowUserCssPrefs ) {
-			$defaultPreferences['showtoc'] = array(
-				'type' => 'toggle',
-				'section' => 'rendering/advancedrendering',
-				'label-message' => 'tog-showtoc',
-			);
-		}
 		$defaultPreferences['showhiddencats'] = array(
 			'type' => 'toggle',
 			'section' => 'rendering/advancedrendering',
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 12798f7840..424afceffd 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -77,9 +77,6 @@ class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
 		if ( $options['justify'] ) {
 			$rules[] = "#article, #bodyContent, #mw_content { text-align: justify; }\n";
 		}
-		if ( !$options['showtoc'] ) {
-			$rules[] = "#toc { display: none; }\n";
-		}
 		if ( $options['editfont'] !== 'default' ) {
 			// Double-check that $options['editfont'] consists of safe characters only
 			if ( preg_match( '/^[a-zA-Z0-9_, -]+$/', $options['editfont'] ) ) {
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a3ff563c98..37e5fc8380 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -668,7 +668,6 @@ future releases. Also note that since each list value is wrapped in a unique
 'tog-showtoolbar'             => 'Show edit toolbar',
 'tog-editondblclick'          => 'Edit pages on double click',
 'tog-editsectiononrightclick' => 'Enable section editing by right clicking on section titles',
-'tog-showtoc'                 => 'Show table of contents (for pages with more than 3 headings)',
 'tog-rememberpassword'        => 'Remember my login on this browser (for a maximum of $1 {{PLURAL:$1|day|days}})',
 'tog-watchcreations'          => 'Add pages I create and files I upload to my watchlist',
 'tog-watchdefault'            => 'Add pages and files I edit to my watchlist',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 620ecd2d01..ea45ee65c3 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -38,7 +38,6 @@ $wgMessageStructure = array(
 		'tog-showtoolbar',
 		'tog-editondblclick',
 		'tog-editsectiononrightclick',
-		'tog-showtoc',
 		'tog-rememberpassword',
 		'tog-watchcreations',
 		'tog-watchdefault',
-- 
2.20.1