Replace Linker::link() usage with LinkRenderer
authorrlot <rj23@protonmail.com>
Fri, 2 Dec 2016 15:43:12 +0000 (16:43 +0100)
committerrlot <rj23@protonmail.com>
Fri, 2 Dec 2016 18:24:22 +0000 (19:24 +0100)
Replaced deprecated Linker:link() with LinkRenderer

Bug: T149346
Change-Id: Iab158d49b186835a14c357c91a1c5c4f78986238

includes/specialpage/LoginSignupSpecialPage.php
includes/specialpage/WantedQueryPage.php
includes/specials/SpecialPrefixindex.php
includes/specials/SpecialRevisiondelete.php
includes/specials/SpecialSpecialpages.php
includes/specials/pagers/NewFilesPager.php

index 73a1bdd..540ce4b 100644 (file)
@@ -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
                );
index 39e3649..00fca12 100644 (file)
@@ -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 )
-                                       ? '<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,
                                        [],
index 5e3e430..4671591 100644 (file)
@@ -228,9 +228,9 @@ class SpecialPrefixindex extends SpecialAllPages {
                                                $displayed = substr( $displayed, $prefixLength );
                                        }
                                        $link = ( $title->isRedirect() ? '<div class="allpagesredirect">' : '' ) .
-                                               Linker::linkKnown(
+                                               $this->getLinkRenderer()->makeKnownLink(
                                                        $title,
-                                                       htmlspecialchars( $displayed )
+                                                       $displayed
                                                ) .
                                                ( $title->isRedirect() ? '</div>' : '' );
 
@@ -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
                        );
index dcaff4d..8780c56 100644 (file)
@@ -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() ]
                                        );
index 688a6ef..b18b370 100644 (file)
@@ -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 ) ],
index 41819fc..9f6c58c 100644 (file)
@@ -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(