Merge remote-tracking branch 'github/pull/618'

[chef.git] / cookbooks / mediawiki / templates / default / mw-ext-SpamBlacklist.inc.php.erb

diff --git a/cookbooks/mediawiki/templates/default/mw-ext-SpamBlacklist.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-SpamBlacklist.inc.php.erb
index 35b2834aad144a01aa245b5914418f982e0744f0..721ea398e4812c988f0c035ab7bf27a0ec77a2a0 100644 (file)
--- a/cookbooks/mediawiki/templates/default/mw-ext-SpamBlacklist.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-SpamBlacklist.inc.php.erb
@@ -1,7 +1,11 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 ini_set( 'pcre.backtrack_limit', '16M' );
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 ini_set( 'pcre.backtrack_limit', '16M' );

-require_once( $IP.'/extensions/SpamBlacklist/SpamBlacklist.php' );
+wfLoadExtension( 'SpamBlacklist' );

 $wgSpamBlacklistFiles = array(
 $wgSpamBlacklistFiles = array(

-       'http://meta.wikimedia.org/w/index.php?title=Spam_blacklist&action=raw&sb_ver=1'
+       'https://meta.wikimedia.org/w/index.php?title=Spam_blacklist&action=raw&sb_ver=1'

 );
 );

+# log hits, but allow only administrators to view them
+$wgLogSpamBlacklistHits = true;
+$wgGroupPermissions['user']['spamblacklistlog'] = false;
+$wgGroupPermissions['sysop']['spamblacklistlog'] = true;