| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1988,6 +1988,7 @@ |
| 1989 | 1989 | 'ipblocklist-sh-addressblocks', |
| 1990 | 1990 | 'ipblocklist-summary', |
| 1991 | 1991 | 'ipblocklist-submit', |
| | 1992 | + 'ipblocklist-otherblocks', |
| 1992 | 1993 | 'blocklistline', |
| 1993 | 1994 | 'infiniteblock', |
| 1994 | 1995 | 'expiringblock', |
| Index: trunk/phase3/docs/hooks.txt |
| — | — | @@ -782,6 +782,11 @@ |
| 783 | 783 | $url: string value as output (out parameter, can modify) |
| 784 | 784 | $query: query options passed to Title::getLocalURL() |
| 785 | 785 | |
| | 786 | +'getOtherBlockLogLink': Get links to the block log from extensions which blocks |
| | 787 | + users and/or IP addresses too |
| | 788 | +$otherBlockLink: An array with links to other block logs |
| | 789 | +$$this->ip: The requested IP address or username |
| | 790 | + |
| 786 | 791 | 'GetPreferences': modify user preferences |
| 787 | 792 | $user: User whose preferences are being modified. |
| 788 | 793 | &$preferences: Preferences description array, to be fed to an HTMLForm object |
| Index: trunk/phase3/includes/specials/SpecialIpblocklist.php |
| — | — | @@ -311,6 +311,20 @@ |
| 312 | 312 | $wgOut->addHTML( $this->searchForm() ); |
| 313 | 313 | $wgOut->addWikiMsg( 'ipblocklist-empty' ); |
| 314 | 314 | } |
| | 315 | + |
| | 316 | + $otherBlockLink = array(); |
| | 317 | + wfRunHooks( 'getOtherBlockLogLink', array( &$otherBlockLink, $this->ip ) ); |
| | 318 | + if( count( $otherBlockLink ) ) { |
| | 319 | + $wgOut->addHTML( |
| | 320 | + Html::rawElement( 'h2', array(), wfMsg( 'ipblocklist-otherblocks' ) ) . "\n" |
| | 321 | + ); |
| | 322 | + $list = ''; |
| | 323 | + foreach( $otherBlockLink as $link ) { |
| | 324 | + $list .= Html::rawElement( 'li', array(), $link ) . "\n"; |
| | 325 | + } |
| | 326 | + $wgOut->addHTML( Html::rawElement( 'ul', array( 'class' => 'mw-ipblocklist-otherblocks' ), $list ) . "\n" ); |
| | 327 | + } |
| | 328 | + |
| 315 | 329 | } |
| 316 | 330 | |
| 317 | 331 | function searchForm() { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2953,6 +2953,7 @@ |
| 2954 | 2954 | 'ipblocklist-sh-addressblocks' => '$1 single IP blocks', |
| 2955 | 2955 | 'ipblocklist-summary' => '', # do not translate or duplicate this message to other languages |
| 2956 | 2956 | 'ipblocklist-submit' => 'Search', |
| | 2957 | +'ipblocklist-otherblocks' => 'Other blocks', |
| 2957 | 2958 | 'blocklistline' => '$1, $2 blocked $3 ($4)', |
| 2958 | 2959 | 'infiniteblock' => 'infinite', |
| 2959 | 2960 | 'expiringblock' => 'expires on $1 at $2', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -263,6 +263,8 @@ |
| 264 | 264 | contains the number of revisions in the history |
| 265 | 265 | * $wgStylePath and $wgLogo are now set in the default LocalSettings.php file. |
| 266 | 266 | * (bug 20186) Allow filtering history for revision deletion. |
| | 267 | +* New hook getOtherBlockLogLink, called in Special:IPBlockList to show links |
| | 268 | + to block logs of other blocking extensions, i.e. GlobalBlocking |
| 267 | 269 | |
| 268 | 270 | === Bug fixes in 1.16 === |
| 269 | 271 | |