Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/282426
Change subject: Move disable of preference 'enotifminoredits'
......................................................................
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
---
M includes/Preferences.php
M includes/Setup.php
2 files changed, 8 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/282426/1
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 66a8152..ad97f19 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -544,12 +544,14 @@
];
}
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
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -361,11 +361,6 @@
$wgUsersNotifiedOnAllChanges = [];
}
-// Doesn't make sense to have if disabled.
-if ( !$wgEnotifMinorEdits ) {
- $wgHiddenPrefs[] = 'enotifminoredits';
-}
-
if ( $wgMetaNamespace === false ) {
$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
}
--
To view, visit https://gerrit.wikimedia.org/r/282426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e1afd65c8924f18fdfa6cb5c9a47481b036b74f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
