From b2d91f90e4d8a0fa62239ee42ed35a44072bdbc6 Mon Sep 17 00:00:00 2001
From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sat, 12 Mar 2011 23:22:34 +0000
Subject: [PATCH] Follow-up r83786: update references in
 SpecialPage::getTitleFor() and friends to point to 'Block' rather than
 'Blockip'; should fix errors on translatewiki.

---
 includes/DefaultSettings.php                      | 2 +-
 includes/Linker.php                               | 2 +-
 includes/LogEventsList.php                        | 2 +-
 includes/SkinTemplate.php                         | 2 +-
 includes/specials/SpecialContributions.php        | 4 ++--
 includes/specials/SpecialDeletedContributions.php | 4 ++--
 includes/specials/SpecialIpblocklist.php          | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7e9a3553bc..64f770d9ae 100644
--- 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 599114ce4d..22e5ecf800 100644
--- 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 c4496facc9..860ea9c0dd 100644
--- 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 ce686f6d2c..27ca162c43 100644
--- 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 406c0f3a41..fc2cfedc53 100644
--- 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 6041e3c0ff..e9e6f6639b 100644
--- 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 c71a41d9b5..18f15d1de3 100644
--- 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' );
 			}
-- 
2.20.1