http://www.mediawiki.org/wiki/Special:Code/MediaWiki/83796
Revision: 83796
Author: happy-melon
Date: 2011-03-12 23:22:34 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
Follow-up r83786: update references in SpecialPage::getTitleFor() and friends
to point to 'Block' rather than 'Blockip'; should fix errors on translatewiki.
Modified Paths:
--------------
trunk/extensions/CheckUser/CheckUser_body.php
trunk/extensions/ConfirmAccount/ConfirmAccount_body.php
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/Linker.php
trunk/phase3/includes/LogEventsList.php
trunk/phase3/includes/SkinTemplate.php
trunk/phase3/includes/specials/SpecialContributions.php
trunk/phase3/includes/specials/SpecialDeletedContributions.php
trunk/phase3/includes/specials/SpecialIpblocklist.php
Modified: trunk/extensions/CheckUser/CheckUser_body.php
===================================================================
--- trunk/extensions/CheckUser/CheckUser_body.php 2011-03-12 22:53:15 UTC
(rev 83795)
+++ trunk/extensions/CheckUser/CheckUser_body.php 2011-03-12 23:22:34 UTC
(rev 83796)
@@ -432,7 +432,7 @@
if ( !$dbr->numRows( $ret ) ) {
$s = $this->noMatchesMessage( $user ) . "\n";
} else {
- $blockip = SpecialPage::getTitleFor( 'Blockip' );
+ $blockip = SpecialPage::getTitleFor( 'Block' );
$ips_edits = array();
$counter = 0;
foreach ( $ret as $row ) {
Modified: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php
===================================================================
--- trunk/extensions/ConfirmAccount/ConfirmAccount_body.php 2011-03-12
22:53:15 UTC (rev 83795)
+++ trunk/extensions/ConfirmAccount/ConfirmAccount_body.php 2011-03-12
23:22:34 UTC (rev 83796)
@@ -325,7 +325,7 @@
$form .= self::parseLinks($row->acr_urls);
}
if( $wgUser->isAllowed( 'requestips' ) ) {
- $blokip = SpecialPage::getTitleFor( 'Blockip' );
+ $blokip = SpecialPage::getTitleFor( 'Block' );
$form .= "<p>".wfMsgHtml('confirmaccount-ip')."
".htmlspecialchars($row->acr_ip).
" (" . $this->skin->makeKnownLinkObj( $blokip,
wfMsgHtml('blockip'),
'ip=' . $row->acr_ip .
'&wpCreateAccount=1' ).")</p>\n";
Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php 2011-03-12 22:53:15 UTC (rev
83795)
+++ trunk/phase3/includes/DefaultSettings.php 2011-03-12 23:22:34 UTC (rev
83796)
@@ -4942,7 +4942,7 @@
'Listadmins' => 'users',
'Listbots' => 'users',
'Userrights' => 'users',
- 'Blockip' => 'users',
+ 'Block' => 'users',
'Preferences' => 'users',
'Resetpass' => 'users',
'DeletedContributions' => 'users',
Modified: trunk/phase3/includes/Linker.php
===================================================================
--- trunk/phase3/includes/Linker.php 2011-03-12 22:53:15 UTC (rev 83795)
+++ trunk/phase3/includes/Linker.php 2011-03-12 23:22:34 UTC (rev 83796)
@@ -942,7 +942,7 @@
* @private
*/
function blockLink( $userId, $userText ) {
- $blockPage = SpecialPage::getTitleFor( 'Blockip', $userText );
+ $blockPage = SpecialPage::getTitleFor( 'Block', $userText );
$blockLink = $this->link( $blockPage, wfMsgHtml( 'blocklink' )
);
return $blockLink;
}
Modified: trunk/phase3/includes/LogEventsList.php
===================================================================
--- trunk/phase3/includes/LogEventsList.php 2011-03-12 22:53:15 UTC (rev
83795)
+++ trunk/phase3/includes/LogEventsList.php 2011-03-12 23:22:34 UTC (rev
83796)
@@ -411,7 +411,7 @@
) .
$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(),
Modified: trunk/phase3/includes/SkinTemplate.php
===================================================================
--- trunk/phase3/includes/SkinTemplate.php 2011-03-12 22:53:15 UTC (rev
83795)
+++ trunk/phase3/includes/SkinTemplate.php 2011-03-12 23:22:34 UTC (rev
83796)
@@ -1224,7 +1224,7 @@
if ( $wgUser->isAllowed( 'block' ) ) {
$nav_urls['blockip'] = array(
- 'href' => self::makeSpecialUrlSubpage(
'Blockip', $rootUser )
+ 'href' => self::makeSpecialUrlSubpage(
'Block', $rootUser )
);
} else {
$nav_urls['blockip'] = false;
Modified: trunk/phase3/includes/specials/SpecialContributions.php
===================================================================
--- trunk/phase3/includes/specials/SpecialContributions.php 2011-03-12
22:53:15 UTC (rev 83795)
+++ trunk/phase3/includes/specials/SpecialContributions.php 2011-03-12
23:22:34 UTC (rev 83796)
@@ -252,7 +252,7 @@
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 @@
);
} else { # User is not blocked
$tools[] = $sk->linkKnown( # Block link
- SpecialPage::getTitleFor(
'Blockip', $username ),
+ SpecialPage::getTitleFor(
'Block', $username ),
wfMsgHtml( 'blocklink' )
);
}
Modified: trunk/phase3/includes/specials/SpecialDeletedContributions.php
===================================================================
--- trunk/phase3/includes/specials/SpecialDeletedContributions.php
2011-03-12 22:53:15 UTC (rev 83795)
+++ trunk/phase3/includes/specials/SpecialDeletedContributions.php
2011-03-12 23:22:34 UTC (rev 83796)
@@ -372,7 +372,7 @@
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 @@
}
else { # User is not blocked
$tools[] = $sk->linkKnown( #
Block link
-
SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
+
SpecialPage::getTitleFor( 'Block', $nt->getDBkey() ),
wfMsgHtml( 'blocklink' )
);
}
Modified: trunk/phase3/includes/specials/SpecialIpblocklist.php
===================================================================
--- trunk/phase3/includes/specials/SpecialIpblocklist.php 2011-03-12
22:53:15 UTC (rev 83795)
+++ trunk/phase3/includes/specials/SpecialIpblocklist.php 2011-03-12
23:22:34 UTC (rev 83796)
@@ -498,7 +498,7 @@
# 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' );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
