From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 8 Apr 2016 20:19:27 +0000 (+0200)
Subject: Move disable of preference 'enotifminoredits'
X-Git-Tag: 1.31.0-rc.0~7268^2
X-Git-Url: http://git.cyclocoop.org/%22%20%20.%20generer_url_ecrire%28%22mots_tous%22%29%20.%20%22?a=commitdiff_plain;h=d7de1f8c322afebbc79689f83064f806954ea0cd;p=lhc%2Fweb%2Fwiklou.git

Move disable of preference 'enotifminoredits'

Instead of setting $wgHiddenPrefs in Setup.php when $wgEnotifMinorEdits
is false, it is better to check the config in Preferences.php.
This makes it easier to found the config, why the preference is not
shown.

$wgHiddenPrefs should not be used in core itself

Change-Id: I7e1afd65c8924f18fdfa6cb5c9a47481b036b74f
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 66a81524aa..ad97f1960b 100644
--- 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 d7f1189a77..cddb4369f9 100644
--- 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 );
 }