Daniel Kinzler has uploaded a new change for review.

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


Change subject: Fix missing default blacklist.
......................................................................

Fix missing default blacklist.

The default blacklist was no longer being used, because the line
$wgSpamBlacklistFiles =& $wgBlacklistSettings['spam']['files']
initialized $wgBlacklistSettings['spam']['files'] to null,
and BaseBlacklist::__construct then overrode $this->files
with null.

Change-Id: I22448bfb87eef6dd86b61362f3eb6bb2198a10b6
---
M SpamBlacklist.php
M SpamBlacklist_body.php
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist 
refs/changes/99/76899/1

diff --git a/SpamBlacklist.php b/SpamBlacklist.php
index f3e27f3..5791801 100644
--- a/SpamBlacklist.php
+++ b/SpamBlacklist.php
@@ -21,7 +21,11 @@
 /**
  * Array of settings for blacklist classes
  */
-$wgBlacklistSettings = array();
+$wgBlacklistSettings = array(
+       'spam' => array(
+               'files' => array( 
"http://meta.wikimedia.org/w/index.php?title=Spam_blacklist&action=raw&sb_ver=1";
 )
+       )
+);
 
 /**
  * @deprecated
diff --git a/SpamBlacklist_body.php b/SpamBlacklist_body.php
index 7279e20..6b6b9cd 100644
--- a/SpamBlacklist_body.php
+++ b/SpamBlacklist_body.php
@@ -5,7 +5,6 @@
 }
 
 class SpamBlacklist extends BaseBlacklist {
-       var $files = array( 
"http://meta.wikimedia.org/w/index.php?title=Spam_blacklist&action=raw&sb_ver=1";
 );
        var $ignoreEditSummary = false;
 
        /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22448bfb87eef6dd86b61362f3eb6bb2198a10b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to