From d8c56ec84f4045f821b6d89748e5be1537327a03 Mon Sep 17 00:00:00 2001 From: MtDu Date: Tue, 29 Nov 2016 18:05:22 -0600 Subject: [PATCH] Replace Linker::link() with LinkRenderer in some special pages * SpecialAllPages * SpecialAncientpage * SpecialBlock * SpecialBrokenRedirects * SpecialDoubleRedirects Bug: T149346 Change-Id: Ib9997ec29b5c0079acb79dc2772196b38665145d --- includes/specials/SpecialAllPages.php | 12 +++++++----- includes/specials/SpecialAncientpages.php | 5 +++-- includes/specials/SpecialBlock.php | 18 +++++++++++------- includes/specials/SpecialBrokenRedirects.php | 15 ++++++++------- includes/specials/SpecialDoubleRedirects.php | 17 ++++++++--------- 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/includes/specials/SpecialAllPages.php b/includes/specials/SpecialAllPages.php index 4a2a619716..4b8446a795 100644 --- a/includes/specials/SpecialAllPages.php +++ b/includes/specials/SpecialAllPages.php @@ -204,6 +204,7 @@ class SpecialAllPages extends IncludableSpecialPage { ] ); + $linkRenderer = $this->getLinkRenderer(); if ( $res->numRows() > 0 ) { $out = Html::openElement( 'ul', [ 'class' => 'mw-allpages-chunk' ] ); @@ -213,7 +214,7 @@ class SpecialAllPages extends IncludableSpecialPage { $out .= 'page_is_redirect ? ' class="allpagesredirect"' : '' ) . '>' . - Linker::link( $t ) . + $linkRenderer->makeLink( $t ) . "\n"; } else { $out .= '
  • [[' . htmlspecialchars( $s->page_title ) . "]]
    • \n"; @@ -269,6 +270,7 @@ class SpecialAllPages extends IncludableSpecialPage { $navLinks = []; $self = $this->getPageTitle(); + $linkRenderer = $this->getLinkRenderer(); // Generate a "previous page" link if needed if ( $prevTitle ) { $query = [ 'from' => $prevTitle->getText() ]; @@ -281,9 +283,9 @@ class SpecialAllPages extends IncludableSpecialPage { $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 @@ class SpecialAllPages extends IncludableSpecialPage { $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 9ee1b75a06..ecc030e638 100644 --- a/includes/specials/SpecialAncientpages.php +++ b/includes/specials/SpecialAncientpages.php @@ -78,9 +78,10 @@ class AncientPagesPage extends QueryPage { $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 ce7d24e57b..585f70b86b 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -372,12 +372,13 @@ class SpecialBlock extends FormSpecialPage { $this->getOutput()->addModuleStyles( 'mediawiki.special' ); + $linkRenderer = $this->getLinkRenderer(); # Link to the user's contributions, if applicable if ( $this->target instanceof User ) { $contribsPage = SpecialPage::getTitleFor( 'Contributions', $this->target->getName() ); - $links[] = Linker::link( + $links[] = $linkRenderer->makeLink( $contribsPage, - $this->msg( 'ipb-blocklist-contribs', $this->target->getName() )->escaped() + $this->msg( 'ipb-blocklist-contribs', $this->target->getName() )->text() ); } @@ -392,21 +393,24 @@ class SpecialBlock extends FormSpecialPage { $message = $this->msg( 'ipb-unblock' )->parse(); $list = SpecialPage::getTitleFor( 'Unblock' ); } - $links[] = Linker::linkKnown( $list, $message, [] ); + $links[] = $linkRenderer->makeKnownLink( + $list, + new HtmlArmor( $message ) + ); # Link to the block list - $links[] = Linker::linkKnown( + $links[] = $linkRenderer->makeKnownLink( SpecialPage::getTitleFor( 'BlockList' ), - $this->msg( 'ipb-blocklist' )->escaped() + $this->msg( 'ipb-blocklist' )->text() ); $user = $this->getUser(); # Link to edit the block dropdown reasons, if applicable if ( $user->isAllowed( 'editinterface' ) ) { - $links[] = Linker::linkKnown( + $links[] = $linkRenderer->makeKnownLink( $this->msg( 'ipbreason-dropdown' )->inContentLanguage()->getTitle(), - $this->msg( 'ipb-edit-dropdown' )->escaped(), + $this->msg( 'ipb-edit-dropdown' )->text(), [], [ 'action' => 'edit' ] ); diff --git a/includes/specials/SpecialBrokenRedirects.php b/includes/specials/SpecialBrokenRedirects.php index 17533968a0..8927fbf58f 100644 --- a/includes/specials/SpecialBrokenRedirects.php +++ b/includes/specials/SpecialBrokenRedirects.php @@ -109,12 +109,13 @@ class BrokenRedirectsPage extends QueryPage { } } + $linkRenderer = $this->getLinkRenderer(); // $toObj may very easily be false if the $result list is cached if ( !is_object( $toObj ) ) { - return '' . Linker::link( $fromObj ) . ''; + return '' . $linkRenderer->makeLink( $fromObj ) . ''; } - $from = Linker::linkKnown( + $from = $linkRenderer->makeKnownLink( $fromObj, null, [], @@ -128,14 +129,14 @@ class BrokenRedirectsPage extends QueryPage { // 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(), + $this->msg( 'brokenredirects-edit' )->text(), [], [ 'action' => 'edit' ] ); } - $to = Linker::link( + $to = $linkRenderer->makeLink( $toObj, null, [], @@ -147,9 +148,9 @@ class BrokenRedirectsPage extends QueryPage { $out = $from . $this->msg( 'word-separator' )->escaped(); if ( $this->getUser()->isAllowed( 'delete' ) ) { - $links[] = Linker::linkKnown( + $links[] = $linkRenderer->makeKnownLink( $fromObj, - $this->msg( 'brokenredirects-delete' )->escaped(), + $this->msg( 'brokenredirects-delete' )->text(), [], [ 'action' => 'delete' ] ); diff --git a/includes/specials/SpecialDoubleRedirects.php b/includes/specials/SpecialDoubleRedirects.php index 0cec9d076c..9140bf1426 100644 --- a/includes/specials/SpecialDoubleRedirects.php +++ b/includes/specials/SpecialDoubleRedirects.php @@ -137,14 +137,15 @@ class DoubleRedirectsPage extends QueryPage { $result = $dbr->fetchObject( $res ); } } + $linkRenderer = $this->getLinkRenderer(); if ( !$result ) { - return '' . Linker::link( $titleA, null, [], [ 'redirect' => 'no' ] ) . ''; + return '' . $linkRenderer->makeLink( $titleA, null, [], [ 'redirect' => 'no' ] ) . ''; } $titleB = Title::makeTitle( $result->nsb, $result->tb ); $titleC = Title::makeTitle( $result->nsc, $result->tc, '', $result->iwc ); - $linkA = Linker::linkKnown( + $linkA = $linkRenderer->makeKnownLink( $titleA, null, [], @@ -158,26 +159,24 @@ class DoubleRedirectsPage extends QueryPage { // check, if the content model is editable through action=edit ContentHandler::getForTitle( $titleA )->supportsDirectEditing() ) { - $edit = Linker::linkKnown( + $edit = $linkRenderer->makeKnownLink( $titleA, - $this->msg( 'parentheses', $this->msg( 'editlink' )->text() )->escaped(), + $this->msg( 'parentheses', $this->msg( 'editlink' )->text() )->text(), [], - [ - 'action' => 'edit' - ] + [ 'action' => 'edit' ] ); } else { $edit = ''; } - $linkB = Linker::linkKnown( + $linkB = $linkRenderer->makeKnownLink( $titleB, null, [], [ 'redirect' => 'no' ] ); - $linkC = Linker::linkKnown( $titleC ); + $linkC = $linkRenderer->makeKnownLink( $titleC ); $lang = $this->getLanguage(); $arr = $lang->getArrow() . $lang->getDirMark(); -- 2.20.1