jenkins-bot has submitted this change and it was merged.
Change subject: Use WikiMap directly
......................................................................
Use WikiMap directly
WikiMap has been moved to MW core from CentralAuth in 2009, so
no need to wrap around this any longer.
Change-Id: I44ed497da4cf74067c3b38cecb7a35fbaa5f4c98
---
M includes/GlobalBlocking.class.php
M includes/specials/SpecialGlobalBlockList.php
2 files changed, 3 insertions(+), 20 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GlobalBlocking.class.php
b/includes/GlobalBlocking.class.php
index 067a3b9..069a433 100644
--- a/includes/GlobalBlocking.class.php
+++ b/includes/GlobalBlocking.class.php
@@ -36,7 +36,7 @@
$blockTimestamp = $wgLang->timeanddate( wfTimestamp(
TS_MW, $block->gb_timestamp ), true );
$blockExpiry = $wgLang->formatExpiry( $block->gb_expiry
);
- $display_wiki = self::getWikiName( $block->gb_by_wiki );
+ $display_wiki = WikiMap::getWikiName(
$block->gb_by_wiki );
$blockingUser = self::maybeLinkUserpage(
$block->gb_by_wiki, $block->gb_by );
// Allow site customization of blocked message.
$blockedIpMsg = 'globalblocking-ipblocked';
@@ -61,7 +61,7 @@
true
);
$blockExpiry = $wgLang->formatExpiry(
$block->gb_expiry );
- $display_wiki = self::getWikiName(
$block->gb_by_wiki );
+ $display_wiki = WikiMap::getWikiName(
$block->gb_by_wiki );
$blockingUser =
self::maybeLinkUserpage( $block->gb_by_wiki, $block->gb_by );
// Allow site customization of blocked
message.
$blockedIpXffMsg =
'globalblocking-ipblocked-xff';
@@ -277,23 +277,6 @@
*/
static function getWhitelistInfoByIP( $block_ip ) {
return self::getWhitelistInfo( null, $block_ip );
- }
-
- /**
- * @param $wiki_id int
- * @return String
- */
- static function getWikiName( $wiki_id ) {
- if ( class_exists( 'WikiMap' ) ) {
- // We can give more info than just the wiki id!
- $wiki = WikiMap::getWiki( $wiki_id );
-
- if ( $wiki ) {
- return $wiki->getDisplayName();
- }
- }
-
- return $wiki_id;
}
/**
diff --git a/includes/specials/SpecialGlobalBlockList.php
b/includes/specials/SpecialGlobalBlockList.php
index 42b177f..32bb807 100644
--- a/includes/specials/SpecialGlobalBlockList.php
+++ b/includes/specials/SpecialGlobalBlockList.php
@@ -189,7 +189,7 @@
}
## Userpage link / Info on originating wiki
- $display_wiki = GlobalBlocking::getWikiName( $row->gb_by_wiki );
+ $display_wiki = WikiMap::getWikiName( $row->gb_by_wiki );
$user_display = GlobalBlocking::maybeLinkUserpage(
$row->gb_by_wiki, $row->gb_by );
$infoItems = count( $info ) ?
$this->msg( 'parentheses',
$this->getLanguage()->pipeList( $info ) )->text() :
--
To view, visit https://gerrit.wikimedia.org/r/166355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44ed497da4cf74067c3b38cecb7a35fbaa5f4c98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
