jenkins-bot has submitted this change and it was merged.
Change subject: Use extension registration for SpamBlacklist
......................................................................
Use extension registration for SpamBlacklist
Get rid of wg/wmg hack.
Bug: T119117
Change-Id: I6926f772ef3544cda533cd536eedc64f2a6d2758
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b09ba5d..b033ec1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -810,7 +810,7 @@
}
if ( $wmgUseSpamBlacklist ) {
- include( $IP . '/extensions/SpamBlacklist/SpamBlacklist.php' );
+ wfLoadExtension( 'SpamBlacklist' );
$wgBlacklistSettings = [
'spam' => [
'files' => [
@@ -819,7 +819,6 @@
],
];
$wgLogSpamBlacklistHits = true;
- $wgSpamBlacklistEventLogging = $wmgSpamBlacklistEventLogging;
}
wfLoadExtension( 'TitleBlacklist' );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 18a5db2..58a0306 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11781,7 +11781,8 @@
'private' => false,
'fishbowl' => false, // not needed, private editing...
],
-'wmgSpamBlacklistEventLogging' => [
+
+'wgSpamBlacklistEventLogging' => [
'default' => false,
'testwiki' => true,
],
--
To view, visit https://gerrit.wikimedia.org/r/292312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6926f772ef3544cda533cd536eedc64f2a6d2758
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: MZMcBride <w...@mzmcbride.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
