r35854 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r35853‎ | r35854 | r35855 >
Date:08:13, 4 June 2008
Author:werdna
Status:old
Tags:
Comment:
Fix block overriding
Modified paths:
  • /trunk/extensions/TorBlock/TorBlock.class.php (modified) (history)
  • /trunk/extensions/TorBlock/TorBlock.php (modified) (history)

Diff [purge]

Index: trunk/extensions/TorBlock/TorBlock.php
@@ -31,6 +31,7 @@
3232 $wgHooks['getUserPermissionsErrorsExpensive'][] = 'TorBlock::onGetUserPermissionsErrorsExpensive';
3333 $wgHooks['AbortAutoblock'][] = 'TorBlock::onAbortAutoblock';
3434 $wgHooks['GetAutoPromoteGroups'][] = 'TorBlock::onGetAutoPromoteGroups';
 35+$wgHooks['GetBlockedStatus'][] = 'TorBlock::onGetBlockedStatus';
3536
3637 /**
3738 * Permission keys that bypass Tor blocks.
Index: trunk/extensions/TorBlock/TorBlock.class.php
@@ -120,7 +120,7 @@
121121 if (self::isExitNode() && $user->mBlock && !$user->mBlock->mUser) {
122122 wfDebug( "User using Tor node. Disabling IP block as it was probably targetted at the tor node." );
123123 // Node is probably blocked for being a Tor node. Remove block.
124 - $user->mBlockedBy = 0;
 124+ $user->mBlockedby = 0;
125125 }
126126
127127 return true;

Status & tagging log