| Index: trunk/phase3/docs/hooks.txt |
| — | — | @@ -787,11 +787,6 @@ |
| 788 | 788 | $url: string value as output (out parameter, can modify) |
| 789 | 789 | $query: query options passed to Title::getLocalURL() |
| 790 | 790 | |
| 791 | | -'getOtherBlockLogLink': Get links to the block log from extensions which blocks |
| 792 | | - users and/or IP addresses too |
| 793 | | -$otherBlockLink: An array with links to other block logs |
| 794 | | -$ip: The requested IP address or username |
| 795 | | - |
| 796 | 791 | 'GetPreferences': modify user preferences |
| 797 | 792 | $user: User whose preferences are being modified. |
| 798 | 793 | &$preferences: Preferences description array, to be fed to an HTMLForm object |
| — | — | @@ -1112,6 +1107,11 @@ |
| 1113 | 1108 | Hooks can alter or append to the array of URLs for search & suggestion formats. |
| 1114 | 1109 | &$urls: array of associative arrays with Url element attributes |
| 1115 | 1110 | |
| | 1111 | +'OtherBlockLogLink': Get links to the block log from extensions which blocks |
| | 1112 | + users and/or IP addresses too |
| | 1113 | +$otherBlockLink: An array with links to other block logs |
| | 1114 | +$ip: The requested IP address or username |
| | 1115 | + |
| 1116 | 1116 | 'OutputPageBeforeHTML': a page has been processed by the parser and |
| 1117 | 1117 | the resulting HTML is about to be displayed. |
| 1118 | 1118 | $parserOutput: the parserOutput (object) that corresponds to the page |
| Index: trunk/phase3/includes/specials/SpecialIpblocklist.php |
| — | — | @@ -302,7 +302,7 @@ |
| 303 | 303 | |
| 304 | 304 | // Check for other blocks, i.e. global/tor blocks |
| 305 | 305 | $otherBlockLink = array(); |
| 306 | | - wfRunHooks( 'getOtherBlockLogLink', array( &$otherBlockLink, $this->ip ) ); |
| | 306 | + wfRunHooks( 'OtherBlockLogLink', array( &$otherBlockLink, $this->ip ) ); |
| 307 | 307 | |
| 308 | 308 | // Show additional header for the local block only when other blocks exists. |
| 309 | 309 | // Not necessary in a standard installation without such extensions enabled |
| Index: trunk/phase3/includes/specials/SpecialBlockip.php |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | $wgOut->addHTML( Xml::tags( 'p', array( 'class' => 'error' ), $msg ) ); |
| 109 | 109 | } elseif( $this->BlockAddress ) { |
| 110 | 110 | # Get other blocks, i.e. from GlobalBlocking or TorBlock extension |
| 111 | | - wfRunHooks( 'getOtherBlockLogLink', array( &$otherBlockedMsgs, $this->BlockAddress ) ); |
| | 111 | + wfRunHooks( 'OtherBlockLogLink', array( &$otherBlockedMsgs, $this->BlockAddress ) ); |
| 112 | 112 | |
| 113 | 113 | $userId = is_object( $user ) ? $user->getId() : 0; |
| 114 | 114 | $currentBlock = Block::newFromDB( $this->BlockAddress, $userId ); |
| Index: trunk/extensions/TorBlock/TorBlock.php |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | $wgHooks['AbuseFilter-filterAction'][] = 'TorBlock::onAbuseFilterFilterAction'; |
| 39 | 39 | $wgHooks['AbuseFilter-builder'][] = 'TorBlock::onAbuseFilterBuilder'; |
| 40 | 40 | $wgHooks['EmailUserPermissionsErrors'][] = 'TorBlock::onEmailUserPermissionsErrors'; |
| 41 | | -$wgHooks['getOtherBlockLogLink'][] = 'TorBlock::getTorBlockStatus'; |
| | 41 | +$wgHooks['OtherBlockLogLink'][] = 'TorBlock::getTorBlockStatus'; |
| 42 | 42 | |
| 43 | 43 | // Define new autopromote condition |
| 44 | 44 | define('APCOND_TOR', 'tor'); // Numbers won't work, we'll get collisions |
| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.php |
| — | — | @@ -29,7 +29,7 @@ |
| 30 | 30 | $wgHooks['getUserPermissionsErrorsExpensive'][] = 'GlobalBlocking::getUserPermissionsErrors'; |
| 31 | 31 | $wgHooks['UserIsBlockedGlobally'][] = 'GlobalBlocking::isBlockedGlobally'; |
| 32 | 32 | $wgHooks['UserLoginMailPassword'][] = 'GlobalBlocking::onMailPassword'; |
| 33 | | -$wgHooks['getOtherBlockLogLink'][] = 'GlobalBlocking::getBlockLogLink'; |
| | 33 | +$wgHooks['OtherBlockLogLink'][] = 'GlobalBlocking::getBlockLogLink'; |
| 34 | 34 | |
| 35 | 35 | $wgAutoloadClasses['SpecialGlobalBlock'] = "$dir/SpecialGlobalBlock.php"; |
| 36 | 36 | $wgSpecialPages['GlobalBlock'] = 'SpecialGlobalBlock'; |