Georggi199 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/325918 )
Change subject: Removed deprecated Linker::link usages. ...................................................................... Removed deprecated Linker::link usages. Removed deprecated Linker::link\linkKnown usages in NewsletterConte.php, NewsletterLogFormatter.php, NewletterTablePager.php, SpecialNewsletter.php, SpecialNewsletterCreate.php, SpecialNewsletters.php Bug: T149346 Change-Id: I3610bc94ce8b0d6799e96888f1368d199f66dbf1 --- M includes/content/NewsletterContent.php M includes/logging/NewsletterLogFormatter.php M includes/specials/SpecialNewsletter.php M includes/specials/SpecialNewsletterCreate.php M includes/specials/SpecialNewsletters.php M includes/specials/pagers/NewsletterTablePager.php 6 files changed, 32 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/18/325918/1 diff --git a/includes/content/NewsletterContent.php b/includes/content/NewsletterContent.php index db354f5..3c879ae 100644 --- a/includes/content/NewsletterContent.php +++ b/includes/content/NewsletterContent.php @@ -4,6 +4,8 @@ * @author tonythomas */ +use MediaWiki\MediaWikiServices; + class NewsletterContent extends JsonContent { /** Subpage actions */ const NEWSLETTER_ANNOUNCE = 'announce'; @@ -144,7 +146,7 @@ 'mainpage' => array( 'type' => 'info', 'label-message' => 'newsletter-view-mainpage', - 'default' => Linker::link( $mainTitle ), + 'default' => MediaWikiServices::getInstance()->getLinkRenderer()->makeLink( $mainTitle ), 'raw' => true, ), 'description' => array( @@ -339,11 +341,12 @@ protected function getNavigationLinks( ParserOptions $options ) { global $wgOut; - $listLink = Linker::linkKnown( + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); + $listLink = $linkRenderer->makeKnownLink( SpecialPage::getTitleFor( 'Newsletters' ), wfMessage( 'backlinksubtitle', wfMessage( 'newsletter-subtitlelinks-list' )->text() - )->escaped() + )->text() ); $user = $options->getUser(); @@ -364,13 +367,13 @@ // Messages used here: 'newsletter-subtitlelinks-announce', // 'newsletter-subtitlelinks-subscribe', 'newsletter-subtitlelinks-unsubscribe' - $msg = wfMessage( 'newsletter-subtitlelinks-' . $action )->escaped(); - $link = Linker::linkKnown( $title, $msg ); + $msg = wfMessage( 'newsletter-subtitlelinks-' . $action )->text(); + $link = $linkRenderer->makeKnownLink( $title, $msg ); if ( $action == self::NEWSLETTER_MANAGE ) { $title = Title::makeTitleSafe( NS_NEWSLETTER, $this->newsletter->getName() ); - $msg = wfMessage( 'newsletter-subtitlelinks-' . $action )->escaped(); - $link = Linker::linkKnown( $title, $msg, [], $query =['action'=>'edit'] ); + $msg = wfMessage( 'newsletter-subtitlelinks-' . $action )->text(); + $link = $linkRenderer->makeKnownLink( $title, $msg, [], $query =['action'=>'edit'] ); } $links[] = $link; } diff --git a/includes/logging/NewsletterLogFormatter.php b/includes/logging/NewsletterLogFormatter.php index 100cc52..5898468 100644 --- a/includes/logging/NewsletterLogFormatter.php +++ b/includes/logging/NewsletterLogFormatter.php @@ -43,9 +43,9 @@ list( $id, $name ) = explode( ':', $value, 2 ); $title = SpecialPage::getTitleFor( 'Newsletter', $id ); if ( !$this->plaintext ) { - return Message::rawParam( Linker::link( + return Message::rawParam( MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer()->makeLink( $title, - htmlspecialchars( $name ), + $name, [] ) ); } else { diff --git a/includes/specials/SpecialNewsletter.php b/includes/specials/SpecialNewsletter.php index d476911..0702e5c 100644 --- a/includes/specials/SpecialNewsletter.php +++ b/includes/specials/SpecialNewsletter.php @@ -92,11 +92,11 @@ * @param string|null $current subpage currently being shown, null if default "view" page */ protected function getNavigationLinks( $current ) { - $listLink = Linker::linkKnown( + $listLink = $this->getLinkRenderer()->makeKnownLink( SpecialPage::getTitleFor( 'Newsletters' ), $this->msg( 'backlinksubtitle', $this->msg( 'newsletter-subtitlelinks-list' )->text() - )->escaped() + )->text() ); if ( $current === null ) { // We've the fancy buttons on the default "view" page so don't @@ -125,12 +125,12 @@ // Messages used here: 'newsletter-subtitlelinks-announce', // 'newsletter-subtitlelinks-subscribe', 'newsletter-subtitlelinks-unsubscribe' // 'newsletter-subtitlelinks-manage' - $msg = $this->msg( 'newsletter-subtitlelinks-' . $action )->escaped(); - $link = Linker::linkKnown( $title, $msg ); + $msg = $this->msg( 'newsletter-subtitlelinks-' . $action )->text(); + $link = $this->getLinkRenderer()->makeKnownLink( $title, $msg ); if ( $action == self::NEWSLETTER_MANAGE ) { $title = Title::makeTitleSafe( NS_NEWSLETTER, $this->newsletter->getName() ); - $msg = $this->msg( 'newsletter-subtitlelinks-' . $action )->escaped(); - $link = Linker::linkKnown( $title, $msg, [], $query =['action'=>'edit'] ); + $msg = $this->msg( 'newsletter-subtitlelinks-' . $action )->text(); + $link = $this->getLinkRenderer()->makeKnownLink( $title, $msg, [], $query =['action'=>'edit'] ); } if ( $current === $action ) { $links[] = Linker::makeSelfLinkObj( $title, $msg ); @@ -140,12 +140,12 @@ } } - $newsletterLinks = Linker::linkKnown( + $newsletterLinks = $this->getLinkRenderer()->makeKnownLink( Title::makeTitleSafe( NS_NEWSLETTER, $this->newsletter->getName() ), - $this->getEscapedName() + $this->getName() ) . ' ' . $this->msg( 'parentheses' ) ->rawParams( $this->getLanguage()->pipeList( $links ) ) - ->escaped(); + ->text(); return $this->getLanguage()->pipeList( array( $listLink, $newsletterLinks ) ); } @@ -204,7 +204,7 @@ 'mainpage' => array( 'type' => 'info', 'label-message' => 'newsletter-view-mainpage', - 'default' => Linker::link( $mainTitle, htmlspecialchars( $mainTitle->getPrefixedText() ) ), + 'default' => $this->getLinkRenderer()->makeLink( $mainTitle, $mainTitle->getPrefixedText() ), 'raw' => true, ), 'description' => array( diff --git a/includes/specials/SpecialNewsletterCreate.php b/includes/specials/SpecialNewsletterCreate.php index f63c072..f6419d5 100644 --- a/includes/specials/SpecialNewsletterCreate.php +++ b/includes/specials/SpecialNewsletterCreate.php @@ -21,9 +21,9 @@ $this->requireLogin(); parent::execute( $par ); $this->getOutput()->setSubtitle( - Linker::linkKnown( + $this->getLinkRenderer()->makeKnownLink( SpecialPage::getTitleFor( 'Newsletters' ), - $this->msg( 'newsletter-subtitlelinks-list' )->escaped() + $this->msg( 'newsletter-subtitlelinks-list' )->text() ) ); } diff --git a/includes/specials/SpecialNewsletters.php b/includes/specials/SpecialNewsletters.php index 138b232..27b3b91 100644 --- a/includes/specials/SpecialNewsletters.php +++ b/includes/specials/SpecialNewsletters.php @@ -25,9 +25,9 @@ $user = $this->getUser(); if ( $user->isAllowed( 'newsletter-create' ) ) { - $createLink = Linker::linkKnown( + $createLink = $this->getLinkRenderer()->makeKnownLink( SpecialPage::getTitleFor( 'NewsletterCreate' ), - $this->msg( 'newsletter-subtitlelinks-create' )->escaped() + $this->msg( 'newsletter-subtitlelinks-create' )->text() ); $out->setSubtitle( $createLink ); } diff --git a/includes/specials/pagers/NewsletterTablePager.php b/includes/specials/pagers/NewsletterTablePager.php index c5e738d..68e3029 100644 --- a/includes/specials/pagers/NewsletterTablePager.php +++ b/includes/specials/pagers/NewsletterTablePager.php @@ -78,13 +78,14 @@ public function formatValue( $field, $value ) { global $wgContLang; + $linkRenderer = \MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer(); $id = $this->mCurrentRow->nl_id; $newsletter = Newsletter::newFromID( (int)$id ); switch ( $field ) { case 'nl_name': $title = Title::makeTitleSafe( NS_NEWSLETTER, $newsletter->getName() ); if ( $title ) { - return Linker::linkKnown( $title, htmlspecialchars( $value ) ); + return $linkRenderer->makeKnownLink( $title, $value ); } else { return htmlspecialchars( $value ); } @@ -101,8 +102,8 @@ $title = SpecialPage::getTitleFor( 'Newsletter', $id . '/' . SpecialNewsletter::NEWSLETTER_UNSUBSCRIBE ); - $link = Linker::linkKnown( $title, - $this->msg( 'newsletter-unsubscribe-button' )->escaped(), + $link = $linkRenderer->makeKnownLink( $title, + $this->msg( 'newsletter-unsubscribe-button' )->text(), array( 'class' => 'newsletter-subscription newsletter-subscribed', 'data-newsletter-id' => $id @@ -112,9 +113,9 @@ $title = SpecialPage::getTitleFor( 'Newsletter', $id . '/' . SpecialNewsletter::NEWSLETTER_SUBSCRIBE ); - $link = Linker::linkKnown( + $link = $linkRenderer->makeKnownLink( $title, - $this->msg( 'newsletter-subscribe-button' )->escaped(), + $this->msg( 'newsletter-subscribe-button' )->text()k, array( 'class' => 'newsletter-subscription newsletter-unsubscribed', 'data-newsletter-id' => $id -- To view, visit https://gerrit.wikimedia.org/r/325918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3610bc94ce8b0d6799e96888f1368d199f66dbf1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Georggi199 <bmp2...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits