Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318352
Change subject: Replace deprecated Linker::linkKnown and Linker::link functions
......................................................................
Replace deprecated Linker::linkKnown and Linker::link functions
Bug: T149346
Change-Id: I63b115d8c489035beb0921d097e557d89b3cde72
---
M includes/page/ImageHistoryList.php
M includes/specialpage/PageQueryPage.php
M includes/specialpage/WantedQueryPage.php
M includes/specials/SpecialBrokenRedirects.php
M includes/specials/SpecialFewestrevisions.php
M includes/specials/SpecialMostcategories.php
M includes/specials/SpecialMostinterwikis.php
M includes/specials/SpecialMostlinked.php
M includes/specials/SpecialMostlinkedtemplates.php
M includes/specials/SpecialUnwatchedpages.php
M includes/specials/pagers/BlockListPager.php
M includes/specials/pagers/DeletedContribsPager.php
12 files changed, 49 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/318352/1
diff --git a/includes/page/ImageHistoryList.php
b/includes/page/ImageHistoryList.php
index bb8ed24..36d1b30 100644
--- a/includes/page/ImageHistoryList.php
+++ b/includes/page/ImageHistoryList.php
@@ -124,6 +124,8 @@
$local = $this->current->isLocal();
$row = $selected = '';
+ $linkRenderer = $this->getLinkRenderer();
+
// Deletion link
if ( $local && ( $user->isAllowedAny( 'delete',
'deletedhistory' ) ) ) {
$row .= '<td>';
@@ -133,7 +135,7 @@
if ( !$iscur ) {
$q['oldimage'] = $img;
}
- $row .= Linker::linkKnown(
+ $row .= $linkRenderer->makeKnownLink(
$this->title,
$this->msg( $iscur ?
'filehist-deleteall' : 'filehist-deleteone' )->escaped(),
[], $q
@@ -173,7 +175,7 @@
if ( $file->isDeleted( File::DELETED_FILE ) ) {
$row .= $this->msg( 'filehist-revert'
)->escaped();
} else {
- $row .= Linker::linkKnown(
+ $row .= $linkRenderer->makeKnownLink(
$this->title,
$this->msg( 'filehist-revert'
)->escaped(),
[],
@@ -200,7 +202,7 @@
$this->preventClickjacking();
$revdel = SpecialPage::getTitleFor(
'Revisiondelete' );
# Make a link to review the image
- $url = Linker::linkKnown(
+ $url = $linkRenderer->makeKnownLink(
$revdel,
$lang->userTimeAndDate( $timestamp,
$user ),
[],
diff --git a/includes/specialpage/PageQueryPage.php
b/includes/specialpage/PageQueryPage.php
index 97f004f..7c7cc8c 100644
--- a/includes/specialpage/PageQueryPage.php
+++ b/includes/specialpage/PageQueryPage.php
@@ -63,7 +63,7 @@
if ( $title instanceof Title ) {
$text = $wgContLang->convert( $title->getPrefixedText()
);
- return Linker::link( $title, htmlspecialchars( $text )
);
+ return $this->getLinkRenderer()->makeLink( $title,
htmlspecialchars( $text ) );
} else {
return Html::element( 'span', [ 'class' =>
'mw-invalidtitle' ],
Linker::getInvalidTitleDescription(
$this->getContext(), $row->namespace, $row->title ) );
diff --git a/includes/specialpage/WantedQueryPage.php
b/includes/specialpage/WantedQueryPage.php
index 1c19f3c..36f2958 100644
--- a/includes/specialpage/WantedQueryPage.php
+++ b/includes/specialpage/WantedQueryPage.php
@@ -76,13 +76,14 @@
*/
public function formatResult( $skin, $result ) {
$title = Title::makeTitleSafe( $result->namespace,
$result->title );
+ $linkRenderer = $this->getLinkRenderer();
if ( $title instanceof Title ) {
if ( $this->isCached() || $this->forceExistenceCheck()
) {
$pageLink = $this->existenceCheck( $title )
- ? '<del>' . Linker::link( $title ) .
'</del>'
- : Linker::link( $title );
+ ? '<del>' . $linkRenderer->makeLink(
$title ) . '</del>'
+ : $linkRenderer->makeLink( $title );
} else {
- $pageLink = Linker::link(
+ $pageLink = $linkRenderer->makeLink(
$title,
null,
[],
@@ -125,6 +126,6 @@
private function makeWlhLink( $title, $result ) {
$wlh = SpecialPage::getTitleFor( 'Whatlinkshere',
$title->getPrefixedText() );
$label = $this->msg( 'nlinks' )->numParams( $result->value
)->escaped();
- return Linker::link( $wlh, $label );
+ return $this->getLinkRenderer()->makeLink( $wlh, $label );
}
}
diff --git a/includes/specials/SpecialBrokenRedirects.php
b/includes/specials/SpecialBrokenRedirects.php
index b9b2051..0a89a07 100644
--- a/includes/specials/SpecialBrokenRedirects.php
+++ b/includes/specials/SpecialBrokenRedirects.php
@@ -109,12 +109,14 @@
}
}
+ $linkRenderer = $this->getLinkRenderer();
+
// $toObj may very easily be false if the $result list is cached
if ( !is_object( $toObj ) ) {
- return '<del>' . Linker::link( $fromObj ) . '</del>';
+ return '<del>' . $linkRenderer->makeLink( $fromObj ) .
'</del>';
}
- $from = Linker::linkKnown(
+ $from = $linkRenderer->makeKnownLink(
$fromObj,
null,
[],
@@ -128,14 +130,14 @@
// check, if the content model is editable through
action=edit
ContentHandler::getForTitle( $fromObj
)->supportsDirectEditing()
) {
- $links[] = Linker::linkKnown(
+ $links[] = $linkRenderer->makeKnownLink(
$fromObj,
$this->msg( 'brokenredirects-edit' )->escaped(),
[],
[ 'action' => 'edit' ]
);
}
- $to = Linker::link(
+ $to = $linkRenderer->makeLink(
$toObj,
null,
[],
@@ -147,7 +149,7 @@
$out = $from . $this->msg( 'word-separator' )->escaped();
if ( $this->getUser()->isAllowed( 'delete' ) ) {
- $links[] = Linker::linkKnown(
+ $links[] = $linkRenderer->makeKnownLink(
$fromObj,
$this->msg( 'brokenredirects-delete'
)->escaped(),
[],
diff --git a/includes/specials/SpecialFewestrevisions.php
b/includes/specials/SpecialFewestrevisions.php
index b86a95e..31ca9fb 100644
--- a/includes/specials/SpecialFewestrevisions.php
+++ b/includes/specials/SpecialFewestrevisions.php
@@ -89,13 +89,15 @@
);
}
+ $linkRenderer = $this->getLinkRenderer();
+
$text = htmlspecialchars( $wgContLang->convert(
$nt->getPrefixedText() ) );
- $plink = Linker::linkKnown( $nt, $text );
+ $plink = $linkRenderer->makeKnownLink( $nt, $text );
$nl = $this->msg( 'nrevisions' )->numParams( $result->value
)->escaped();
$redirect = isset( $result->redirect ) && $result->redirect ?
' - ' . $this->msg( 'isredirect' )->escaped() : '';
- $nlink = Linker::linkKnown(
+ $nlink = $linkRenderer->makeKnownLink(
$nt,
$nl,
[],
diff --git a/includes/specials/SpecialMostcategories.php
b/includes/specials/SpecialMostcategories.php
index 06d21d5..1e1bc15 100644
--- a/includes/specials/SpecialMostcategories.php
+++ b/includes/specials/SpecialMostcategories.php
@@ -103,10 +103,12 @@
);
}
+ $linkRenderer = $this->getLinkRenderer();
+
if ( $this->isCached() ) {
- $link = Linker::link( $title );
+ $link = $linkRenderer->makeLink( $title );
} else {
- $link = Linker::linkKnown( $title );
+ $link = $linkRenderer->makeKnownLink( $title );
}
$count = $this->msg( 'ncategories' )->numParams( $result->value
)->escaped();
diff --git a/includes/specials/SpecialMostinterwikis.php
b/includes/specials/SpecialMostinterwikis.php
index 8271d16..a86ab11 100644
--- a/includes/specials/SpecialMostinterwikis.php
+++ b/includes/specials/SpecialMostinterwikis.php
@@ -110,10 +110,12 @@
);
}
+ $linkRenderer = $this->getLinkRenderer();
+
if ( $this->isCached() ) {
- $link = Linker::link( $title );
+ $link = $linkRenderer->makeLink( $title );
} else {
- $link = Linker::linkKnown( $title );
+ $link = $linkRenderer->makeKnownLink( $title );
}
$count = $this->msg( 'ninterwikis' )->numParams( $result->value
)->escaped();
diff --git a/includes/specials/SpecialMostlinked.php
b/includes/specials/SpecialMostlinked.php
index 3663647..2967e77 100644
--- a/includes/specials/SpecialMostlinked.php
+++ b/includes/specials/SpecialMostlinked.php
@@ -100,7 +100,7 @@
function makeWlhLink( $title, $caption ) {
$wlh = SpecialPage::getTitleFor( 'Whatlinkshere',
$title->getPrefixedDBkey() );
- return Linker::linkKnown( $wlh, $caption );
+ return $this->getLinkRenderer()->makeKnownLink( $wlh, $caption
);
}
/**
@@ -124,7 +124,7 @@
);
}
- $link = Linker::link( $title );
+ $link = $this->getLinkRenderer()->makeLink( $title );
$wlh = $this->makeWlhLink(
$title,
$this->msg( 'nlinks' )->numParams( $result->value
)->escaped()
diff --git a/includes/specials/SpecialMostlinkedtemplates.php
b/includes/specials/SpecialMostlinkedtemplates.php
index 950241f..e383dfc 100644
--- a/includes/specials/SpecialMostlinkedtemplates.php
+++ b/includes/specials/SpecialMostlinkedtemplates.php
@@ -114,7 +114,7 @@
}
return $this->getLanguage()->specialList(
- Linker::link( $title ),
+ $this->getLinkRenderer()->makeLink( $title ),
$this->makeWlhLink( $title, $result )
);
}
@@ -130,7 +130,7 @@
$wlh = SpecialPage::getTitleFor( 'Whatlinkshere',
$title->getPrefixedText() );
$label = $this->msg( 'ntransclusions' )->numParams(
$result->value )->escaped();
- return Linker::link( $wlh, $label );
+ return $this->getLinkRenderer()->makeLink( $wlh, $label );
}
protected function getGroupName() {
diff --git a/includes/specials/SpecialUnwatchedpages.php
b/includes/specials/SpecialUnwatchedpages.php
index df57744..3c5c59c 100644
--- a/includes/specials/SpecialUnwatchedpages.php
+++ b/includes/specials/SpecialUnwatchedpages.php
@@ -95,8 +95,10 @@
$text = $wgContLang->convert( $nt->getPrefixedText() );
- $plink = Linker::linkKnown( $nt, htmlspecialchars( $text ) );
- $wlink = Linker::linkKnown(
+ $linkRenderer = $this->getLinkRenderer();
+
+ $plink = $linkRenderer->makeKnownLink( $nt, htmlspecialchars(
$text ) );
+ $wlink = $linkRenderer->makeKnownLink(
$nt,
$this->msg( 'watch' )->escaped(),
[ 'class' => 'mw-watch-link' ],
diff --git a/includes/specials/pagers/BlockListPager.php
b/includes/specials/pagers/BlockListPager.php
index d822976..2af2026 100644
--- a/includes/specials/pagers/BlockListPager.php
+++ b/includes/specials/pagers/BlockListPager.php
@@ -115,20 +115,21 @@
$value,
/* User preference timezone */true
) );
+ $linkRenderer = $this->getLinkRenderer();
if ( $this->getUser()->isAllowed( 'block' ) ) {
if ( $row->ipb_auto ) {
- $links[] = Linker::linkKnown(
+ $links[] =
$linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Unblock' ),
$msg['unblocklink'],
[],
[ 'wpTarget' =>
"#{$row->ipb_id}" ]
);
} else {
- $links[] = Linker::linkKnown(
+ $links[] =
$linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Unblock', $row->ipb_address ),
$msg['unblocklink']
);
- $links[] = Linker::linkKnown(
+ $links[] =
$linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Block', $row->ipb_address ),
$msg['change-blocklink']
);
diff --git a/includes/specials/pagers/DeletedContribsPager.php
b/includes/specials/pagers/DeletedContribsPager.php
index 1acbba1..e8191ca 100644
--- a/includes/specials/pagers/DeletedContribsPager.php
+++ b/includes/specials/pagers/DeletedContribsPager.php
@@ -253,8 +253,10 @@
$undelete = SpecialPage::getTitleFor( 'Undelete' );
+ $linkRenderer = $this->getLinkRenderer();
+
$logs = SpecialPage::getTitleFor( 'Log' );
- $dellog = Linker::linkKnown(
+ $dellog = $linkRenderer->makeKnownLink(
$logs,
$this->messages['deletionlog'],
[],
@@ -264,7 +266,7 @@
]
);
- $reviewlink = Linker::linkKnown(
+ $reviewlink = $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Undelete',
$page->getPrefixedDBkey() ),
$this->messages['undeleteviewlink']
);
@@ -272,7 +274,7 @@
$user = $this->getUser();
if ( $user->isAllowed( 'deletedtext' ) ) {
- $last = Linker::linkKnown(
+ $last = $linkRenderer->makeKnownLink(
$undelete,
$this->messages['diff'],
[],
@@ -293,7 +295,7 @@
if ( !$user->isAllowed( 'undelete' ) || !$rev->userCan(
Revision::DELETED_TEXT, $user ) ) {
$link = $date; // unusable link
} else {
- $link = Linker::linkKnown(
+ $link = $linkRenderer->makeKnownLink(
$undelete,
$date,
[ 'class' => 'mw-changeslist-date' ],
@@ -308,7 +310,7 @@
$link = '<span class="history-deleted">' . $link .
'</span>';
}
- $pagelink = Linker::link(
+ $pagelink = $linkRenderer->makeLink(
$page,
null,
[ 'class' => 'mw-changeslist-title' ]
--
To view, visit https://gerrit.wikimedia.org/r/318352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63b115d8c489035beb0921d097e557d89b3cde72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
