From 366dce15f986c128dc176c8cc18badbf36dc69b2 Mon Sep 17 00:00:00 2001 From: rlot Date: Fri, 2 Dec 2016 16:43:12 +0100 Subject: [PATCH] Replace Linker::link() usage with LinkRenderer Replaced deprecated Linker:link() with LinkRenderer Bug: T149346 Change-Id: Iab158d49b186835a14c357c91a1c5c4f78986238 --- includes/specialpage/LoginSignupSpecialPage.php | 12 ++++++------ includes/specialpage/WantedQueryPage.php | 7 ++++--- includes/specials/SpecialPrefixindex.php | 8 ++++---- includes/specials/SpecialRevisiondelete.php | 13 +++++++------ includes/specials/SpecialSpecialpages.php | 2 +- includes/specials/pagers/NewFilesPager.php | 7 ++++++- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index 73a1bdd203..540ce4bc7c 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -149,9 +149,9 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { $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 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { '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 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { $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 39e3649b12..00fca12c78 100644 --- a/includes/specialpage/WantedQueryPage.php +++ b/includes/specialpage/WantedQueryPage.php @@ -64,14 +64,15 @@ abstract class WantedQueryPage extends QueryPage { * @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 5e3e430a2a..46715918b5 100644 --- a/includes/specials/SpecialPrefixindex.php +++ b/includes/specials/SpecialPrefixindex.php @@ -228,9 +228,9 @@ class SpecialPrefixindex extends SpecialAllPages { $displayed = substr( $displayed, $prefixLength ); } $link = ( $title->isRedirect() ? '
' : '' ) . - Linker::linkKnown( + $this->getLinkRenderer()->makeKnownLink( $title, - htmlspecialchars( $displayed ) + $displayed ) . ( $title->isRedirect() ? '
' : '' ); @@ -275,9 +275,9 @@ class SpecialPrefixindex extends SpecialAllPages { $query['namespace'] = $namespace; } - $nextLink = Linker::linkKnown( + $nextLink = $this->getLinkRenderer()->makeKnownLink( $this->getPageTitle(), - $this->msg( 'nextpage', str_replace( '_', ' ', $nextRow->page_title ) )->escaped(), + $this->msg( 'nextpage', str_replace( '_', ' ', $nextRow->page_title ) )->text(), [], $query ); diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php index dcaff4d9f1..8780c5692e 100644 --- a/includes/specials/SpecialRevisiondelete.php +++ b/includes/specials/SpecialRevisiondelete.php @@ -241,32 +241,33 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { * Show some useful links in the subtitle */ protected function showConvenienceLinks() { + $linkRenderer = $this->getLinkRenderer(); # Give a link to the logs/hist for this page if ( $this->targetObj ) { // Also set header tabs to be for the target. $this->getSkin()->setRelevantTitle( $this->targetObj ); $links = []; - $links[] = Linker::linkKnown( + $links[] = $linkRenderer->makeKnownLink( SpecialPage::getTitleFor( 'Log' ), - $this->msg( 'viewpagelogs' )->escaped(), + $this->msg( 'viewpagelogs' )->text(), [], [ 'page' => $this->targetObj->getPrefixedText() ] ); if ( !$this->targetObj->isSpecialPage() ) { # Give a link to the page history - $links[] = Linker::linkKnown( + $links[] = $linkRenderer->makeKnownLink( $this->targetObj, - $this->msg( 'pagehist' )->escaped(), + $this->msg( 'pagehist' )->text(), [], [ 'action' => 'history' ] ); # Link to deleted edits if ( $this->getUser()->isAllowed( 'undelete' ) ) { $undelete = SpecialPage::getTitleFor( 'Undelete' ); - $links[] = Linker::linkKnown( + $links[] = $linkRenderer->makeKnownLink( $undelete, - $this->msg( 'deletedhist' )->escaped(), + $this->msg( 'deletedhist' )->text(), [], [ 'target' => $this->targetObj->getPrefixedDBkey() ] ); diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php index 688a6efb52..b18b370c6b 100644 --- a/includes/specials/SpecialSpecialpages.php +++ b/includes/specials/SpecialSpecialpages.php @@ -118,7 +118,7 @@ class SpecialSpecialpages extends UnlistedSpecialPage { $pageClasses[] = 'mw-specialpagerestricted'; } - $link = Linker::linkKnown( $title, htmlspecialchars( $desc ) ); + $link = $this->getLinkRenderer()->makeKnownLink( $title, $desc ); $out->addHTML( Html::rawElement( 'li', [ 'class' => implode( ' ', $pageClasses ) ], diff --git a/includes/specials/pagers/NewFilesPager.php b/includes/specials/pagers/NewFilesPager.php index 41819fc431..9f6c58c410 100644 --- a/includes/specials/pagers/NewFilesPager.php +++ b/includes/specials/pagers/NewFilesPager.php @@ -22,6 +22,8 @@ /** * @ingroup Pager */ +use MediaWiki\MediaWikiServices; + class NewFilesPager extends ReverseChronologicalPager { /** @@ -142,7 +144,10 @@ class NewFilesPager extends ReverseChronologicalPager { $user = User::newFromId( $row->img_user ); $title = Title::makeTitle( NS_FILE, $name ); - $ul = Linker::link( $user->getUserPage(), $user->getName() ); + $ul = MediaWikiServices::getInstance()->getLinkRenderer()->makeLink( + $user->getUserPage(), + $user->getName() + ); $time = $this->getLanguage()->userTimeAndDate( $row->img_timestamp, $this->getUser() ); $this->gallery->add( -- 2.20.1