jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372555 )
Change subject: Reinforce LoginNotify settings
......................................................................
Reinforce LoginNotify settings
Instead of reproducing the conditions of Echo usage, check explicitly
if it's enabled, this way is more future proof.
Change-Id: Ib7767ddfffe95f86b9d3b0bcc02c49b3f67cf6d4
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 01a18e3..ce9228c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1975,7 +1975,7 @@
wfLoadExtension( 'TemplateStyles' );
}
-if ( $wmgUseLoginNotify ) {
+if ( $wmgUseLoginNotify && $wmgUseEcho ) {
wfLoadExtension( 'LoginNotify' );
$wgNotifyTypeAvailabilityByCategory['login-success']['web'] = false;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 0acd14d..44dcdc5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19370,8 +19370,7 @@
],
'wmgUseLoginNotify' => [
- 'default' => true,
- 'nonecho' => false,
+ 'default' => true, // But disabled on wikis without Echo in
CommonSettings.php
],
'wmgUseCodeMirror' => [
--
To view, visit https://gerrit.wikimedia.org/r/372555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7767ddfffe95f86b9d3b0bcc02c49b3f67cf6d4
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Niharika29 <[email protected]>
Gerrit-Reviewer: Urbanecm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
