[MediaWiki-commits] [Gerrit] Revert "Use extension registration for SpamBlacklist" - change (operations/mediawiki-config)

[Dereckson (Code Review)]

Dereckson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/292301

Change subject: Revert "Use extension registration for SpamBlacklist"
......................................................................

Revert "Use extension registration for SpamBlacklist"

This reverts commit ed151c224f4e5129c97237f850afa0d80600e159.

Change-Id: If8c2005d14b4c5609a416583909dbe7140fe67e7
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/01/292301/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 765e549..b5d7bc9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -757,8 +757,7 @@
 }
 
 if ( $wmgUseSpamBlacklist ) {
-       wfLoadExtension( 'SpamBlackList' );
-
+       include( $IP . '/extensions/SpamBlacklist/SpamBlacklist.php' );
        $wgBlacklistSettings = [
                'spam' => [
                        'files' => [
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 41786e8..c8ac075 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/extension.json
+$IP/extensions/SpamBlacklist/SpamBlacklist.php
 $IP/extensions/SubPageList3/SubPageList3.php
 $IP/extensions/SubpageSortkey/SubpageSortkey.php
 $IP/extensions/SyntaxHighlight_GeSHi/extension.json

-- 
To view, visit https://gerrit.wikimedia.org/r/292301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8c2005d14b4c5609a416583909dbe7140fe67e7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson <dereck...@espace-win.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits