Merge "Move disable of preference 'enotifminoredits'"

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 559d4ab..3f56240 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -544,12 +544,14 @@ class Preferences {
                                ];
                        }
                        if ( $config->get( 'EnotifUserTalk' ) || $config->get( 'EnotifWatchlist' ) ) {
-                               $defaultPreferences['enotifminoredits'] = [
-                                       'type' => 'toggle',
-                                       'section' => 'personal/email',
-                                       'label-message' => 'tog-enotifminoredits',
-                                       'disabled' => $disableEmailPrefs,
-                               ];
+                               if ( $config->get( 'EnotifMinorEdits' ) ) {
+                                       $defaultPreferences['enotifminoredits'] = [
+                                               'type' => 'toggle',
+                                               'section' => 'personal/email',
+                                               'label-message' => 'tog-enotifminoredits',
+                                               'disabled' => $disableEmailPrefs,
+                                       ];
+                               }
 
                                if ( $config->get( 'EnotifRevealEditorAddress' ) ) {
                                        $defaultPreferences['enotifrevealaddr'] = [

diff --git a/includes/Setup.php b/includes/Setup.php
index d7f1189..cddb436 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -361,11 +361,6 @@ if ( $wgEnableEmail ) {
        $wgUsersNotifiedOnAllChanges = [];
 }
 
-// Doesn't make sense to have if disabled.
-if ( !$wgEnotifMinorEdits ) {
-       $wgHiddenPrefs[] = 'enotifminoredits';
-}
-
 if ( $wgMetaNamespace === false ) {
        $wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 }