[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace Linker::link() usage with LinkRenderer

2016-12-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/325339 )

Change subject: Replace Linker::link() usage with LinkRenderer
..


Replace Linker::link() usage with LinkRenderer

Linker::link() replaced with LinkRenderer in some pages in includes/specials

Bug: T149346
Change-Id: I937bdc99d1342e73f20b8437a9b55dffb04161c5
---
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialRevisiondelete.php
M includes/specials/SpecialSearch.php
M includes/specials/SpecialUncategorizedcategories.php
M includes/specials/SpecialUnwatchedpages.php
M includes/specials/SpecialWhatlinkshere.php
6 files changed, 51 insertions(+), 30 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index cd3299c..66c5145 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -664,12 +664,11 @@
}
unset( $value );
 
-   $text = htmlspecialchars( $title );
if ( $active ) {
-   $text = '' . $text . '';
+   $title = new HtmlArmor( '' . htmlspecialchars( 
$title ) . '' );
}
 
-   return Linker::linkKnown( $this->getPageTitle(), $text, [], 
$params );
+   return $this->getLinkRenderer()->makeKnownLink( 
$this->getPageTitle(), $title, [], $params );
}
 
/**
diff --git a/includes/specials/SpecialRevisiondelete.php 
b/includes/specials/SpecialRevisiondelete.php
index 8780c56..4b0fa00 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -466,9 +466,9 @@
Xml::closeElement( 'form' ) . "\n";
// Show link to edit the dropdown reasons
if ( $this->getUser()->isAllowed( 'editinterface' ) ) {
-   $link = Linker::linkKnown(
+   $link = $this->getLinkRenderer()->makeKnownLink(
$this->msg( 'revdelete-reason-dropdown' 
)->inContentLanguage()->getTitle(),
-   $this->msg( 'revdelete-edit-reasonlist' 
)->escaped(),
+   $this->msg( 'revdelete-edit-reasonlist' 
)->text(),
[],
[ 'action' => 'edit' ]
);
diff --git a/includes/specials/SpecialSearch.php 
b/includes/specials/SpecialSearch.php
index 9f83832..f4e0b5b 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -499,9 +499,16 @@
}
$stParams = array_merge( $params, $this->powerSearchOptions() );
 
-   $suggest = Linker::linkKnown(
+   $linkRenderer = $this->getLinkRenderer();
+
+   $snippet = $textMatches->getSuggestionSnippet() ?: null;
+   if ( $snippet ) {
+   $snippet = new HtmlArmor( $snippet );
+   }
+
+   $suggest = $linkRenderer->makeKnownLink(
$this->getPageTitle(),
-   $textMatches->getSuggestionSnippet() ?: null,
+   $snippet,
[ 'id' => 'mw-search-DYM-suggestion' ],
$stParams
);
@@ -535,18 +542,25 @@
}
$stParams = array_merge( $params, $this->powerSearchOptions() );
 
-   $rewritten = Linker::linkKnown(
+   $linkRenderer = $this->getLinkRenderer();
+
+   $snippet = $textMatches->getQueryAfterRewriteSnippet() ?: null;
+   if ( $snippet ) {
+   $snippet = new HtmlArmor( $snippet );
+   }
+
+   $rewritten = $linkRenderer->makeKnownLink(
$this->getPageTitle(),
-   $textMatches->getQueryAfterRewriteSnippet() ?: null,
+   $snippet,
[ 'id' => 'mw-search-DYM-rewritten' ],
$stParams
);
 
$stParams['search'] = $term;
$stParams['runsuggestion'] = 0;
-   $original = Linker::linkKnown(
+   $original = $linkRenderer->makeKnownLink(
$this->getPageTitle(),
-   htmlspecialchars( $term ),
+   $term,
[ 'id' => 'mw-search-DYM-original' ],
$stParams
);
@@ -766,9 +780,11 @@
Hooks::run( 'ShowSearchHitTitle',
[ &$link_t, &$titleSnippet, $result, $terms, $this, 
&$query ] );
 
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace Linker::link() usage with LinkRenderer

2016-12-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace Linker::link() usage with LinkRenderer
..


Replace Linker::link() usage with LinkRenderer

Replaced deprecated Linker:link() with LinkRenderer

Bug: T149346
Change-Id: Iab158d49b186835a14c357c91a1c5c4f78986238
---
M includes/specialpage/LoginSignupSpecialPage.php
M includes/specialpage/WantedQueryPage.php
M includes/specials/SpecialPrefixindex.php
M includes/specials/SpecialRevisiondelete.php
M includes/specials/SpecialSpecialpages.php
M includes/specials/pagers/NewFilesPager.php
6 files changed, 28 insertions(+), 21 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index 73a1bdd..540ce4b 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -149,9 +149,9 @@
$entryWarning = $this->msg( $request->getVal( 'warning', '' ) );
// bc: provide login link as a parameter for messages where the 
translation
// was not updated
-   $loginreqlink = Linker::linkKnown(
+   $loginreqlink = $this->getLinkRenderer()->makeKnownLink(
$this->getPageTitle(),
-   $this->msg( 'loginreqlink' )->escaped(),
+   $this->msg( 'loginreqlink' )->text(),
[],
[
'returnto' => $this->mReturnTo,
@@ -1134,9 +1134,9 @@
'type' => 'info',
'raw' => true,
'cssclass' => 
'mw-form-related-link-container',
-   'default' => Linker::link(
+   'default' => 
$this->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 
'PasswordReset' ),
-   $this->msg( 
'userlogin-resetpassword-link' )->escaped()
+   $this->msg( 
'userlogin-resetpassword-link' )->text()
),
'weight' => 230,
];
@@ -1315,9 +1315,9 @@
$targetLanguage = Language::factory( $lang );
$attr['lang'] = $attr['hreflang'] = 
$targetLanguage->getHtmlCode();
 
-   return Linker::linkKnown(
+   return $this->getLinkRenderer()->makeKnownLink(
$this->getPageTitle(),
-   htmlspecialchars( $text ),
+   $text,
$attr,
$query
);
diff --git a/includes/specialpage/WantedQueryPage.php 
b/includes/specialpage/WantedQueryPage.php
index 39e3649..00fca12 100644
--- a/includes/specialpage/WantedQueryPage.php
+++ b/includes/specialpage/WantedQueryPage.php
@@ -64,14 +64,15 @@
 * @return string
 */
public function formatResult( $skin, $result ) {
+   $linkRenderer = $this->getLinkRenderer();
$title = Title::makeTitleSafe( $result->namespace, 
$result->title );
if ( $title instanceof Title ) {
if ( $this->isCached() || $this->forceExistenceCheck() 
) {
$pageLink = $this->existenceCheck( $title )
-   ? '' . Linker::link( $title ) . 
''
-   : Linker::link( $title );
+   ? '' . $linkRenderer->makeLink( 
$title ) . ''
+   : $linkRenderer->makeLink( $title );
} else {
-   $pageLink = Linker::link(
+   $pageLink = $linkRenderer->makeLink(
$title,
null,
[],
diff --git a/includes/specials/SpecialPrefixindex.php 
b/includes/specials/SpecialPrefixindex.php
index 5e3e430..4671591 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -228,9 +228,9 @@
$displayed = substr( 
$displayed, $prefixLength );
}
$link = ( $title->isRedirect() ? '' : '' ) .
-   Linker::linkKnown(
+   
$this->getLinkRenderer()->makeKnownLink(
$title,
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace Linker::link() usage with LinkRenderer

2016-12-02 Thread Filip (Code Review) 
Filip has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/324925

Change subject: Replace Linker::link() usage with LinkRenderer
..

Replace Linker::link() usage with LinkRenderer

Replaced deprecated Linker:link() with LinkRenderer

Bug: T149346
Change-Id: Iab158d49b186835a14c357c91a1c5c4f78986238
---
M includes/specialpage/LoginSignupSpecialPage.php
M includes/specialpage/WantedQueryPage.php
M includes/specials/SpecialPrefixindex.php
M includes/specials/SpecialRevisiondelete.php
M includes/specials/SpecialSpecialpages.php
M includes/specials/pagers/NewFilesPager.php
6 files changed, 22 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/25/324925/1

diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index 73a1bdd..7fe988d 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -149,7 +149,7 @@
$entryWarning = $this->msg( $request->getVal( 'warning', '' ) );
// bc: provide login link as a parameter for messages where the 
translation
// was not updated
-   $loginreqlink = Linker::linkKnown(
+   $loginreqlink = $this->getLinkRenderer()->makeKnownLink(
$this->getPageTitle(),
$this->msg( 'loginreqlink' )->escaped(),
[],
@@ -1134,9 +1134,9 @@
'type' => 'info',
'raw' => true,
'cssclass' => 
'mw-form-related-link-container',
-   'default' => Linker::link(
+   'default' => 
$this->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 
'PasswordReset' ),
-   $this->msg( 
'userlogin-resetpassword-link' )->escaped()
+   $this->msg( 
'userlogin-resetpassword-link' )->text()
),
'weight' => 230,
];
@@ -1315,9 +1315,9 @@
$targetLanguage = Language::factory( $lang );
$attr['lang'] = $attr['hreflang'] = 
$targetLanguage->getHtmlCode();
 
-   return Linker::linkKnown(
+   return $this->getLinkRenderer()->makeKnownLink(
$this->getPageTitle(),
-   htmlspecialchars( $text ),
+   $text,
$attr,
$query
);
diff --git a/includes/specialpage/WantedQueryPage.php 
b/includes/specialpage/WantedQueryPage.php
index 39e3649..00fca12 100644
--- a/includes/specialpage/WantedQueryPage.php
+++ b/includes/specialpage/WantedQueryPage.php
@@ -64,14 +64,15 @@
 * @return string
 */
public function formatResult( $skin, $result ) {
+   $linkRenderer = $this->getLinkRenderer();
$title = Title::makeTitleSafe( $result->namespace, 
$result->title );
if ( $title instanceof Title ) {
if ( $this->isCached() || $this->forceExistenceCheck() 
) {
$pageLink = $this->existenceCheck( $title )
-   ? '' . Linker::link( $title ) . 
''
-   : Linker::link( $title );
+   ? '' . $linkRenderer->makeLink( 
$title ) . ''
+   : $linkRenderer->makeLink( $title );
} else {
-   $pageLink = Linker::link(
+   $pageLink = $linkRenderer->makeLink(
$title,
null,
[],
diff --git a/includes/specials/SpecialPrefixindex.php 
b/includes/specials/SpecialPrefixindex.php
index 5e3e430..4671591 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -228,9 +228,9 @@
$displayed = substr( 
$displayed, $prefixLength );
}
$link = ( $title->isRedirect() ? '' : '' ) .
-   Linker::linkKnown(
+   
$this->getLinkRenderer()->makeKnownLink(
$title,
-   htmlspecialchars( 
$displayed )
+   $displayed

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace Linker::link() usage with LinkRenderer

2016-12-02 Thread Filip (Code Review) 
Filip has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/324916

Change subject: Replace Linker::link() usage with LinkRenderer
..

Replace Linker::link() usage with LinkRenderer

Replaced deprecated Link:link() with LinkRenderer

Bug: T149346
Change-Id: Ib4e490a0c8983232cb827533b15c4e1a2125678c
---
M includes/CategoryViewer.php
M includes/actions/MarkpatrolledAction.php
M includes/logging/LogPage.php
M includes/specialpage/PageQueryPage.php
M includes/specials/SpecialAllPages.php
M includes/specials/pagers/BlockListPager.php
6 files changed, 28 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/324916/1

diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index b95f274..6bcd1cd 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -197,7 +197,7 @@
$link = null;
Hooks::run( 'CategoryViewer::generateLink', [ $type, $title, 
$html, &$link ] );
if ( $link === null ) {
-   $link = Linker::link( $title, $html );
+   $link = 
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink( $title, $html );
}
if ( $isRedirect ) {
$link = '' . $link . 
'';
@@ -626,13 +626,14 @@
 * @return string HTML
 */
private function pagingLinks( $first, $last, $type = '' ) {
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
$prevLink = $this->msg( 'prev-page' )->text();
 
if ( $first != '' ) {
$prevQuery = $this->query;
$prevQuery["{$type}until"] = $first;
unset( $prevQuery["{$type}from"] );
-   $prevLink = Linker::linkKnown(
+   $prevLink = $linkRenderer->makeKnownLink(
$this->addFragmentToTitle( $this->title, $type 
),
$prevLink,
[],
@@ -646,7 +647,7 @@
$lastQuery = $this->query;
$lastQuery["{$type}from"] = $last;
unset( $lastQuery["{$type}until"] );
-   $nextLink = Linker::linkKnown(
+   $nextLink = $linkRenderer->makeKnownLink(
$this->addFragmentToTitle( $this->title, $type 
),
$nextLink,
[],
diff --git a/includes/actions/MarkpatrolledAction.php 
b/includes/actions/MarkpatrolledAction.php
index 8df6044..dce4afb 100644
--- a/includes/actions/MarkpatrolledAction.php
+++ b/includes/actions/MarkpatrolledAction.php
@@ -25,6 +25,9 @@
  *
  * @ingroup Actions
  */
+
+use MediaWiki\MediaWikiServices;
+
 class MarkpatrolledAction extends FormAction {
 
public function getName() {
@@ -54,6 +57,8 @@
}
 
protected function preText() {
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
+
$rc = $this->getRecentChange();
$title = $rc->getTitle();
 
@@ -64,8 +69,8 @@
'diff' => $revId,
'oldid' => $rc->getAttribute( 'rc_last_oldid' )
];
-   $revlink = Linker::link( $title, htmlspecialchars( $revId ), 
[], $query );
-   $pagelink = Linker::link( $title, htmlspecialchars( 
$title->getPrefixedText() ) );
+   $revlink = $linkRenderer->makeLink( $title, $revId, [], $query 
);
+   $pagelink = $linkRenderer->makeLink( $title, 
$title->getPrefixedText() );
 
return $this->msg( 'confirm-markpatrolled-top' )->params(
$title->getPrefixedText(),
diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index daaff07..9321a48 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -29,6 +29,8 @@
  * than ever-growing wiki pages.
  *
  */
+use MediaWiki\MediaWikiServices;
+
 class LogPage {
const DELETED_ACTION = 1;
const DELETED_COMMENT = 2;
@@ -294,6 +296,7 @@
 * @return string
 */
protected static function getTitleLink( $type, $lang, $title, &$params 
) {
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer()
if ( !$lang ) {
return $title->getPrefixedText();
}
@@ -304,16 +307,16 @@
# Use the language name for log titles, rather than 
Log/X
if ( $name == 'Log' ) {
$logPage = new LogPage( $par );
-   $titleLink = Linker::link( $title, 
$logPage->getName()->escaped() );
+   $titleLink = $linkRend

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace Linker::link() usage with LinkRenderer

2016-12-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace Linker::link() usage with LinkRenderer
..


Replace Linker::link() usage with LinkRenderer

Bug: T149346
Change-Id: Ie384566617f18ad6c3bf836b39702365d59f714d
---
M includes/actions/CreditsAction.php
M includes/actions/HistoryAction.php
M includes/actions/InfoAction.php
M includes/actions/MarkpatrolledAction.php
M includes/cache/CacheHelper.php
M includes/changetags/ChangeTagsLogItem.php
M includes/logging/BlockLogFormatter.php
M includes/logging/ContentModelLogFormatter.php
M includes/logging/DeleteLogFormatter.php
M includes/logging/LogEventsList.php
10 files changed, 81 insertions(+), 59 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/actions/CreditsAction.php 
b/includes/actions/CreditsAction.php
index 1332ab4..803695a 100644
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -23,6 +23,8 @@
  * @author 
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * @ingroup Actions
  */
@@ -198,14 +200,15 @@
if ( $this->canShowRealUserName() && !$user->isAnon() ) {
$real = $user->getRealName();
} else {
-   $real = false;
+   $real = $user->getName();
}
 
$page = $user->isAnon()
? SpecialPage::getTitleFor( 'Contributions', 
$user->getName() )
: $user->getUserPage();
 
-   return Linker::link( $page, htmlspecialchars( $real ? $real : 
$user->getName() ) );
+   return MediaWikiServices::getInstance()
+   ->getLinkRenderer()->makeLink( $page, $real );
}
 
/**
@@ -231,9 +234,9 @@
 * @return string HTML link
 */
protected function othersLink() {
-   return Linker::linkKnown(
+   return 
MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
-   $this->msg( 'others' )->escaped(),
+   $this->msg( 'others' )->text(),
[],
[ 'action' => 'credits' ]
);
diff --git a/includes/actions/HistoryAction.php 
b/includes/actions/HistoryAction.php
index c1763fa..9573cac 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -23,6 +23,8 @@
  * @ingroup Actions
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * This class handles printing the history page for an article. In order to
  * be efficient, it uses timestamps rather than offsets for paging, to avoid
@@ -58,9 +60,9 @@
 
protected function getDescription() {
// Creation of a subtitle link pointing to [[Special:Log]]
-   return Linker::linkKnown(
+   return 
MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
SpecialPage::getTitleFor( 'Log' ),
-   $this->msg( 'viewpagelogs' )->escaped(),
+   $this->msg( 'viewpagelogs' )->text(),
[],
[ 'page' => $this->getTitle()->getPrefixedText() ]
);
@@ -734,9 +736,9 @@
$undoTooltip = $latest
? [ 'title' => $this->msg( 
'tooltip-undo' )->text() ]
: [];
-   $undolink = Linker::linkKnown(
+   $undolink = 
MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
-   $this->msg( 'editundo' )->escaped(),
+   $this->msg( 'editundo' )->text(),
$undoTooltip,
[
'action' => 'edit',
@@ -788,16 +790,15 @@
 */
function revLink( $rev ) {
$date = $this->getLanguage()->userTimeAndDate( 
$rev->getTimestamp(), $this->getUser() );
-   $date = htmlspecialchars( $date );
if ( $rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) 
) {
-   $link = Linker::linkKnown(
+   $link = 
MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$date,
[ 'class' => 'mw-changeslist-date' ],
[ 'oldid' => $rev->getId() ]
);
} else {
-   $link = $date;
+   $link = htmlspecialchars( $date );
}

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace Linker::link() usage with LinkRenderer in the follow...

2016-11-29 Thread MtDu (Code Review) 
MtDu has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/324355

Change subject: Replace Linker::link() usage with LinkRenderer in the following 
special pages:  - SpecialAllPages   - SpecialAncientpage- SpecialBlock  
- SpecialBrokenRedirects- SpecialDoubleRedirects
..

Replace Linker::link() usage with LinkRenderer in the following special pages:
- SpecialAllPages
- SpecialAncientpage
- SpecialBlock
- SpecialBrokenRedirects
- SpecialDoubleRedirects

Bug: T149346
Change-Id: Ib9997ec29b5c0079acb79dc2772196b38665145d
---
M includes/specials/SpecialAllPages.php
M includes/specials/SpecialAncientpages.php
M includes/specials/SpecialBlock.php
M includes/specials/SpecialBrokenRedirects.php
M includes/specials/SpecialDoubleRedirects.php
5 files changed, 37 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/324355/1

diff --git a/includes/specials/SpecialAllPages.php 
b/includes/specials/SpecialAllPages.php
index 4a2a619..4b8446a 100644
--- a/includes/specials/SpecialAllPages.php
+++ b/includes/specials/SpecialAllPages.php
@@ -204,6 +204,7 @@
]
);
 
+   $linkRenderer = $this->getLinkRenderer();
if ( $res->numRows() > 0 ) {
$out = Html::openElement( 'ul', [ 'class' => 
'mw-allpages-chunk' ] );
 
@@ -213,7 +214,7 @@
$out .= 'page_is_redirect 
? ' class="allpagesredirect"' : '' ) .
'>' .
-   Linker::link( $t ) .
+   
$linkRenderer->makeLink( $t ) .
"\n";
} else {
$out .= '[[' . 
htmlspecialchars( $s->page_title ) . "]]\n";
@@ -269,6 +270,7 @@
$navLinks = [];
$self = $this->getPageTitle();
 
+   $linkRenderer = $this->getLinkRenderer();
// Generate a "previous page" link if needed
if ( $prevTitle ) {
$query = [ 'from' => $prevTitle->getText() ];
@@ -281,9 +283,9 @@
$query['hideredirects'] = $hideredirects;
}
 
-   $navLinks[] = Linker::linkKnown(
+   $navLinks[] = $linkRenderer->makeKnownLink(
$self,
-   $this->msg( 'prevpage', $prevTitle->getText() 
)->escaped(),
+   $this->msg( 'prevpage', $prevTitle->getText() 
)->text(),
[],
$query
);
@@ -304,9 +306,9 @@
$query['hideredirects'] = $hideredirects;
}
 
-   $navLinks[] = Linker::linkKnown(
+   $navLinks[] = $linkRenderer->makeKnownLink(
$self,
-   $this->msg( 'nextpage', $t->getText() 
)->escaped(),
+   $this->msg( 'nextpage', $t->getText() )->text(),
[],
$query
);
diff --git a/includes/specials/SpecialAncientpages.php 
b/includes/specials/SpecialAncientpages.php
index 9ee1b75..ecc030e 100644
--- a/includes/specials/SpecialAncientpages.php
+++ b/includes/specials/SpecialAncientpages.php
@@ -78,9 +78,10 @@
 
$d = $this->getLanguage()->userTimeAndDate( $result->value, 
$this->getUser() );
$title = Title::makeTitle( $result->namespace, $result->title );
-   $link = Linker::linkKnown(
+   $linkRenderer = $this->getLinkRenderer();
+   $link = $linkRenderer->makeKnownLink(
$title,
-   htmlspecialchars( $wgContLang->convert( 
$title->getPrefixedText() ) )
+   $wgContLang->convert( $title->getPrefixedText() )
);
 
return $this->getLanguage()->specialList( $link, 
htmlspecialchars( $d ) );
diff --git a/includes/specials/SpecialBlock.php 
b/includes/specials/SpecialBlock.php
index ce7d24e..585f70b 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -372,12 +372,13 @@
 
$this->getOutput()->addModuleStyles( 'mediawiki.special' );
 
+   $linkRenderer = $this->getLinkRenderer();
# Link to the user's contributions, if applicable
if ( $this->target instanceof User ) {
$contribsPage = SpecialPage: