Follow-up r83786: update references in SpecialPage::getTitleFor() and friends to...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7e9a355..64f770d 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4942,7 +4942,7 @@ $wgSpecialPageGroups = array(
        'Listadmins'                => 'users',
        'Listbots'                  => 'users',
        'Userrights'                => 'users',
-       'Blockip'                   => 'users',
+       'Block'                     => 'users',
        'Preferences'               => 'users',
        'Resetpass'                 => 'users',
        'DeletedContributions'      => 'users',

diff --git a/includes/Linker.php b/includes/Linker.php
index 599114c..22e5ecf 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -942,7 +942,7 @@ class Linker {
         * @private
         */
        function blockLink( $userId, $userText ) {
-               $blockPage = SpecialPage::getTitleFor( 'Blockip', $userText );
+               $blockPage = SpecialPage::getTitleFor( 'Block', $userText );
                $blockLink = $this->link( $blockPage, wfMsgHtml( 'blocklink' ) );
                return $blockLink;
        }

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index c4496fa..860ea9c 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -411,7 +411,7 @@ class LogEventsList {
                                ) .
                                $this->message['pipe-separator'] .
                                $this->skin->link(
-                                       SpecialPage::getTitleFor( 'Blockip', $row->log_title ),
+                                       SpecialPage::getTitleFor( 'Block', $row->log_title ),
                                        $this->message['change-blocklink'],
                                        array(),
                                        array(),

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index ce686f6..27ca162 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1224,7 +1224,7 @@ class SkinTemplate extends Skin {
 
                        if ( $wgUser->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
-                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $rootUser )
+                                       'href' => self::makeSpecialUrlSubpage( 'Block', $rootUser )
                                );
                        } else {
                                $nav_urls['blockip'] = false;

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 406c0f3..fc2cfed 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -252,7 +252,7 @@ class SpecialContributions extends SpecialPage {
                        if( $subject->isAllowed( 'block' ) ) { # Block / Change block / Unblock links
                                if ( $target->isBlocked() ) {
                                        $tools[] = $sk->linkKnown( # Change block link
-                                               SpecialPage::getTitleFor( 'Blockip', $username ),
+                                               SpecialPage::getTitleFor( 'Block', $username ),
                                                wfMsgHtml( 'change-blocklink' )
                                        );
                                        $tools[] = $sk->linkKnown( # Unblock link
@@ -266,7 +266,7 @@ class SpecialContributions extends SpecialPage {
                                        );
                                } else { # User is not blocked
                                        $tools[] = $sk->linkKnown( # Block link
-                                               SpecialPage::getTitleFor( 'Blockip', $username ),
+                                               SpecialPage::getTitleFor( 'Block', $username ),
                                                wfMsgHtml( 'blocklink' )
                                        );
                                }

diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 6041e3c..e9e6f66 100644 (file)
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -372,7 +372,7 @@ class DeletedContributionsPage extends SpecialPage {
                                if( $wgUser->isAllowed( 'block' ) ) { # Block / Change block / Unblock links
                                        if ( $userObj->isBlocked() ) {
                                                $tools[] = $sk->linkKnown( # Change block link
-                                                       SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
+                                                       SpecialPage::getTitleFor( 'Block', $nt->getDBkey() ),
                                                        wfMsgHtml( 'change-blocklink' )
                                                );
                                                $tools[] = $sk->linkKnown( # Unblock link
@@ -387,7 +387,7 @@ class DeletedContributionsPage extends SpecialPage {
                                        }
                                        else { # User is not blocked
                                                $tools[] = $sk->linkKnown( # Block link
-                                                       SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
+                                                       SpecialPage::getTitleFor( 'Block', $nt->getDBkey() ),
                                                        wfMsgHtml( 'blocklink' )
                                                );
                                        }

diff --git a/includes/specials/SpecialIpblocklist.php b/includes/specials/SpecialIpblocklist.php
index c71a41d..18f15d1 100644 (file)
--- a/includes/specials/SpecialIpblocklist.php
+++ b/includes/specials/SpecialIpblocklist.php
@@ -498,7 +498,7 @@ class IPUnblockForm extends SpecialPage {
                        # Create changeblocklink for all blocks with exception of autoblocks
                        if( !$block->mAuto ) {
                                $changeblocklink = wfMsgExt( 'pipe-separator', 'escapenoentities' ) .
-                                       $sk->link( SpecialPage::getTitleFor( 'Blockip', $block->mAddress ), 
+                                       $sk->link( SpecialPage::getTitleFor( 'Block', $block->mAddress ),
                                                $msg['change-blocklink'],
                                                array(), array(), 'known' );
                        }