| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -942,7 +942,7 @@ |
| 943 | 943 | * @private |
| 944 | 944 | */ |
| 945 | 945 | function blockLink( $userId, $userText ) { |
| 946 | | - $blockPage = SpecialPage::getTitleFor( 'Blockip', $userText ); |
| | 946 | + $blockPage = SpecialPage::getTitleFor( 'Block', $userText ); |
| 947 | 947 | $blockLink = $this->link( $blockPage, wfMsgHtml( 'blocklink' ) ); |
| 948 | 948 | return $blockLink; |
| 949 | 949 | } |
| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -411,7 +411,7 @@ |
| 412 | 412 | ) . |
| 413 | 413 | $this->message['pipe-separator'] . |
| 414 | 414 | $this->skin->link( |
| 415 | | - SpecialPage::getTitleFor( 'Blockip', $row->log_title ), |
| | 415 | + SpecialPage::getTitleFor( 'Block', $row->log_title ), |
| 416 | 416 | $this->message['change-blocklink'], |
| 417 | 417 | array(), |
| 418 | 418 | array(), |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -1224,7 +1224,7 @@ |
| 1225 | 1225 | |
| 1226 | 1226 | if ( $wgUser->isAllowed( 'block' ) ) { |
| 1227 | 1227 | $nav_urls['blockip'] = array( |
| 1228 | | - 'href' => self::makeSpecialUrlSubpage( 'Blockip', $rootUser ) |
| | 1228 | + 'href' => self::makeSpecialUrlSubpage( 'Block', $rootUser ) |
| 1229 | 1229 | ); |
| 1230 | 1230 | } else { |
| 1231 | 1231 | $nav_urls['blockip'] = false; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -4942,7 +4942,7 @@ |
| 4943 | 4943 | 'Listadmins' => 'users', |
| 4944 | 4944 | 'Listbots' => 'users', |
| 4945 | 4945 | 'Userrights' => 'users', |
| 4946 | | - 'Blockip' => 'users', |
| | 4946 | + 'Block' => 'users', |
| 4947 | 4947 | 'Preferences' => 'users', |
| 4948 | 4948 | 'Resetpass' => 'users', |
| 4949 | 4949 | 'DeletedContributions' => 'users', |
| Index: trunk/phase3/includes/specials/SpecialIpblocklist.php |
| — | — | @@ -498,7 +498,7 @@ |
| 499 | 499 | # Create changeblocklink for all blocks with exception of autoblocks |
| 500 | 500 | if( !$block->mAuto ) { |
| 501 | 501 | $changeblocklink = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . |
| 502 | | - $sk->link( SpecialPage::getTitleFor( 'Blockip', $block->mAddress ), |
| | 502 | + $sk->link( SpecialPage::getTitleFor( 'Block', $block->mAddress ), |
| 503 | 503 | $msg['change-blocklink'], |
| 504 | 504 | array(), array(), 'known' ); |
| 505 | 505 | } |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -252,7 +252,7 @@ |
| 253 | 253 | if( $subject->isAllowed( 'block' ) ) { # Block / Change block / Unblock links |
| 254 | 254 | if ( $target->isBlocked() ) { |
| 255 | 255 | $tools[] = $sk->linkKnown( # Change block link |
| 256 | | - SpecialPage::getTitleFor( 'Blockip', $username ), |
| | 256 | + SpecialPage::getTitleFor( 'Block', $username ), |
| 257 | 257 | wfMsgHtml( 'change-blocklink' ) |
| 258 | 258 | ); |
| 259 | 259 | $tools[] = $sk->linkKnown( # Unblock link |
| — | — | @@ -266,7 +266,7 @@ |
| 267 | 267 | ); |
| 268 | 268 | } else { # User is not blocked |
| 269 | 269 | $tools[] = $sk->linkKnown( # Block link |
| 270 | | - SpecialPage::getTitleFor( 'Blockip', $username ), |
| | 270 | + SpecialPage::getTitleFor( 'Block', $username ), |
| 271 | 271 | wfMsgHtml( 'blocklink' ) |
| 272 | 272 | ); |
| 273 | 273 | } |
| Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
| — | — | @@ -372,7 +372,7 @@ |
| 373 | 373 | if( $wgUser->isAllowed( 'block' ) ) { # Block / Change block / Unblock links |
| 374 | 374 | if ( $userObj->isBlocked() ) { |
| 375 | 375 | $tools[] = $sk->linkKnown( # Change block link |
| 376 | | - SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ), |
| | 376 | + SpecialPage::getTitleFor( 'Block', $nt->getDBkey() ), |
| 377 | 377 | wfMsgHtml( 'change-blocklink' ) |
| 378 | 378 | ); |
| 379 | 379 | $tools[] = $sk->linkKnown( # Unblock link |
| — | — | @@ -387,7 +387,7 @@ |
| 388 | 388 | } |
| 389 | 389 | else { # User is not blocked |
| 390 | 390 | $tools[] = $sk->linkKnown( # Block link |
| 391 | | - SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ), |
| | 391 | + SpecialPage::getTitleFor( 'Block', $nt->getDBkey() ), |
| 392 | 392 | wfMsgHtml( 'blocklink' ) |
| 393 | 393 | ); |
| 394 | 394 | } |
| Index: trunk/extensions/CheckUser/CheckUser_body.php |
| — | — | @@ -432,7 +432,7 @@ |
| 433 | 433 | if ( !$dbr->numRows( $ret ) ) { |
| 434 | 434 | $s = $this->noMatchesMessage( $user ) . "\n"; |
| 435 | 435 | } else { |
| 436 | | - $blockip = SpecialPage::getTitleFor( 'Blockip' ); |
| | 436 | + $blockip = SpecialPage::getTitleFor( 'Block' ); |
| 437 | 437 | $ips_edits = array(); |
| 438 | 438 | $counter = 0; |
| 439 | 439 | foreach ( $ret as $row ) { |
| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -325,7 +325,7 @@ |
| 326 | 326 | $form .= self::parseLinks($row->acr_urls); |
| 327 | 327 | } |
| 328 | 328 | if( $wgUser->isAllowed( 'requestips' ) ) { |
| 329 | | - $blokip = SpecialPage::getTitleFor( 'Blockip' ); |
| | 329 | + $blokip = SpecialPage::getTitleFor( 'Block' ); |
| 330 | 330 | $form .= "<p>".wfMsgHtml('confirmaccount-ip')." ".htmlspecialchars($row->acr_ip). |
| 331 | 331 | " (" . $this->skin->makeKnownLinkObj( $blokip, wfMsgHtml('blockip'), |
| 332 | 332 | 'ip=' . $row->acr_ip . '&wpCreateAccount=1' ).")</p>\n"; |