From f6aa7b3e88658f7474a78b610f517b0f36d8b5f3 Mon Sep 17 00:00:00 2001
From: tonythomas01 <01tonythomas@gmail.com>
Date: Wed, 4 Dec 2013 23:17:33 +0530
Subject: [PATCH] Removed "Enable section editing via [edit] links" from
 preferences

Unwanted user preference option in MW adding to the clutter.
Users interested in hiding section-edit links can use per-user
(or site-wide) CSS.
Removed 'editsection' from Defaultsettings.php and
ResourceLoaderUserCSSPrefsModule.php
Updated Release Notes

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

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 21d85482f9..b80a9a9ce7 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -190,6 +190,7 @@ changes to languages because of Bugzilla reports.
    access operators should continue to work, as it implements the ArrayAccess
    interface).
 * Option to mark hooks as deprecated has been added.
+* (bug 52811) Preference "Enable section editing via [edit] links" was removed.
 
 ==== Removed classes ====
 * FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 11b4ef68b7..09f30a4072 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3966,8 +3966,8 @@ $wgReservedUsernames = array(
 /**
  * Settings added to this array will override the default globals for the user
  * preferences used by anonymous visitors and newly created accounts.
- * For instance, to disable section editing links:
- * $wgDefaultUserOptions ['editsection'] = 0;
+ * For instance, to disable editing on double clicks:
+ * $wgDefaultUserOptions ['editondblclick'] = 0;
  */
 $wgDefaultUserOptions = array(
 	'ccmeonemails' => 0,
@@ -3977,7 +3977,6 @@ $wgDefaultUserOptions = array(
 	'disablemail' => 0,
 	'editfont' => 'default',
 	'editondblclick' => 0,
-	'editsection' => 1,
 	'editsectiononrightclick' => 0,
 	'enotifminoredits' => 0,
 	'enotifrevealaddr' => 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index e7eab17697..8d6ee5924f 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -792,13 +792,6 @@ class Preferences {
 		global $wgAllowUserCssPrefs;
 
 		## Editing #####################################
-		if ( $wgAllowUserCssPrefs ) {
-			$defaultPreferences['editsection'] = array(
-				'type' => 'toggle',
-				'section' => 'editing/advancedediting',
-				'label-message' => 'tog-editsection',
-			);
-		}
 		$defaultPreferences['editsectiononrightclick'] = array(
 			'type' => 'toggle',
 			'section' => 'editing/advancedediting',
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index a9d10766a0..12798f7840 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -80,9 +80,6 @@ class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
 		if ( !$options['showtoc'] ) {
 			$rules[] = "#toc { display: none; }\n";
 		}
-		if ( !$options['editsection'] ) {
-			$rules[] = ".mw-editsection { 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 f9ea2617c5..a3ff563c98 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -667,7 +667,6 @@ future releases. Also note that since each list value is wrapped in a unique
 'tog-numberheadings'          => 'Auto-number headings',
 'tog-showtoolbar'             => 'Show edit toolbar',
 'tog-editondblclick'          => 'Edit pages on double click',
-'tog-editsection'             => 'Enable section editing via [edit] links',
 '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}})',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index d51cdd0f69..620ecd2d01 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -37,7 +37,6 @@ $wgMessageStructure = array(
 		'tog-numberheadings',
 		'tog-showtoolbar',
 		'tog-editondblclick',
-		'tog-editsection',
 		'tog-editsectiononrightclick',
 		'tog-showtoc',
 		'tog-rememberpassword',
-- 
2.20.1