Mattflaschen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368113 )

Change subject: Make emails for minor edits always available; keep defaults
......................................................................

Make emails for minor edits always available; keep defaults

Instead of blocking the feature entirely, make it always available.
But start the defaults based on the old setting (whether the feature
was usable at all).

This also slightly mitigates a pretty bad bug (T29884) where emails are
blocked.

Bug: T29884
Bug: T142727
Change-Id: Ifd3b76e39aa24d17d41c66e63bbba1e9fd31a473
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/13/368113/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d913d60..2228aba 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1333,6 +1333,10 @@
 
 $wgEnotifUseJobQ = true;
 
+// Keep this true; it's just whether the feature is available at all, not the 
default
+// setting. T142727
+$wgEnotifMinorEdits = true;
+
 // Username spoofing / mixed-script / similarity check detection
 wfLoadExtension( 'AntiSpoof' );
 
@@ -1978,7 +1982,10 @@
 } else {
        $wgDefaultUserOptions['watchdefault'] = 0;
 }
+
+$wgDefaultUserOptions['enotifminoredits'] = $wmgEnotifMinorEditsUserDefault;
 $wgDefaultUserOptions['enotifwatchlistpages'] = 0;
+
 $wgDefaultUserOptions['usenewrc'] = 0;
 $wgDefaultUserOptions['extendwatchlist'] = 0;
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f8096bc..94c0246 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11527,7 +11527,10 @@
        'default' => true,
 ],
 
-'wgEnotifMinorEdits' => [
+// This controls whether minor edits trigger
+// an email notification by default.
+// The feature is always available ($wgEnotifMinorEdits).
+'wmgEnotifMinorEditsUserDefault' => [
        'default' => false,
        'hiwiki' => true,
        'huwiki' => true, // T125351

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd3b76e39aa24d17d41c66e63bbba1e9fd31a473
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to