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

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

diff --git a/cookbooks/mediawiki/templates/default/mw-ext-TitleBlacklist.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-TitleBlacklist.inc.php.erb
index 3a552eb10188ccc4af87704fd750fcd05772310f..111ff3d2fbefd38c3eb66273e15b5f066963ade6 100644 (file)
--- a/cookbooks/mediawiki/templates/default/mw-ext-TitleBlacklist.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-TitleBlacklist.inc.php.erb
@@ -1,13 +1,17 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 <?php
 # DO NOT EDIT - This file is being maintained by Chef

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

 $wgTitleBlacklistSources = array(
   array(
 $wgTitleBlacklistSources = array(
   array(

-    'type' => TBLSRC_LOCALPAGE,
+    'type' => 'localpage',

     'src'  => 'MediaWiki:Titleblacklist',
   ),
   array(
     'src'  => 'MediaWiki:Titleblacklist',
   ),
   array(

-    'type' => TBLSRC_URL,
-    'src'  => 'http://meta.wikimedia.org/w/index.php?title=Title_blacklist&action=raw',
+    'type' => 'url',
+    'src'  => 'https://meta.wikimedia.org/w/index.php?title=Title_blacklist&action=raw',

   ),
 );
   ),
 );

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