01tonythomas has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/108673


Change subject: Removed "Enable section editing via [edit] links" from 
preferences
......................................................................

Removed "Enable section editing via [edit] links" from preferences

Continuation from https://gerrit.wikimedia.org/r/#/c/99171/
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.
Updated RELEASE-NOTES-1.23.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/108673/1

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index acbb2b9..3dadb05 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -190,6 +190,7 @@
    access operators should continue to work, as it implements the ArrayAccess
    interface).
 * Option to mark hooks as deprecated has been added.
+* ( bug 52811 ) Removed "Enable section editing via [edit] links" from 
Preference.
 
 ==== Removed classes ====
 * TitleDependency (unused)
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 31cbb4c..81046bd 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3966,8 +3966,8 @@
 /**
  * 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 @@
        '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 e7eab17..8d6ee59 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -792,13 +792,6 @@
                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 a9d1076..12798f7 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -80,9 +80,6 @@
                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 726b8f0..160ce08 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -667,7 +667,6 @@
 '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 8b76a6b..8c4efaa 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -37,7 +37,6 @@
                'tog-numberheadings',
                'tog-showtoolbar',
                'tog-editondblclick',
-               'tog-editsection',
                'tog-editsectiononrightclick',
                'tog-showtoc',
                'tog-rememberpassword',

-- 
To view, visit https://gerrit.wikimedia.org/r/108673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47ab4280de0b4f4e2ac37cf5af9d8e6d76abe614
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to