jenkins-bot has submitted this change and it was merged.
Change subject: Use extension registration for SpamBlacklist
......................................................................
Use extension registration for SpamBlacklist
Bug: T119117
Change-Id: I8924da7cfd8eea7aa4746af9ebbaeeb698e07e67
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Dereckson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b5d7bc9..765e549 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -757,7 +757,8 @@
}
if ( $wmgUseSpamBlacklist ) {
- include( $IP . '/extensions/SpamBlacklist/SpamBlacklist.php' );
+ wfLoadExtension( 'SpamBlackList' );
+
$wgBlacklistSettings = [
'spam' => [
'files' => [
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index c8ac075..41786e8 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -110,7 +110,7 @@
$IP/extensions/SecurePoll/SecurePoll.php
$IP/extensions/ShortUrl/ShortUrl.php
$IP/extensions/SiteMatrix/SiteMatrix.php
-$IP/extensions/SpamBlacklist/SpamBlacklist.php
+$IP/extensions/SpamBlacklist/extension.json
$IP/extensions/SubPageList3/SubPageList3.php
$IP/extensions/SubpageSortkey/SubpageSortkey.php
$IP/extensions/SyntaxHighlight_GeSHi/extension.json
--
To view, visit https://gerrit.wikimedia.org/r/281239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8924da7cfd8eea7aa4746af9ebbaeeb698e07e67
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson <[email protected]>
Gerrit-Reviewer: Dereckson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Luke081515 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
