jenkins-bot has submitted this change and it was merged.
Change subject: Removed "Enable section editing via [edit] links" from
preferences
......................................................................
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
---
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(-)
Approvals:
Parent5446: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 21d8548..b80a9a9 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) 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 11b4ef6..09f30a4 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 f9ea261..a3ff563 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 d51cdd0..620ecd2 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/99171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fc49106621943ca7180ddb37590b624edac67d5
Gerrit-PatchSet: 19
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
Gerrit-Reviewer: 01tonythomas <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: MZMcBride <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
