jenkins-bot has submitted this change and it was merged. Change subject: SpecialProtectedpages: Use LinkRenderer instead of Linker::link() ......................................................................
SpecialProtectedpages: Use LinkRenderer instead of Linker::link() And remove an unused variable while we're at it. Change-Id: I494caccfff4fb0510f26554395150e59c728c5a1 --- M includes/specials/SpecialProtectedpages.php 1 file changed, 28 insertions(+), 7 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php index 54b471e..342509c 100644 --- a/includes/specials/SpecialProtectedpages.php +++ b/includes/specials/SpecialProtectedpages.php @@ -21,6 +21,8 @@ * @ingroup SpecialPage */ +use MediaWiki\Linker\LinkRenderer; + /** * A special page that lists protected pages * @@ -59,7 +61,8 @@ $size, $indefOnly, $cascadeOnly, - $noRedirect + $noRedirect, + $this->getLinkRenderer() ); $this->getOutput()->addHTML( $this->showOptions( @@ -279,8 +282,27 @@ public $mForm, $mConds; private $type, $level, $namespace, $sizetype, $size, $indefonly, $cascadeonly, $noredirect; + /** + * @var LinkRenderer + */ + private $linkRenderer; + + /** + * @param SpecialProtectedpages $form + * @param array $conds + * @param $type + * @param $level + * @param $namespace + * @param string $sizetype + * @param int $size + * @param bool $indefonly + * @param bool $cascadeonly + * @param bool $noredirect + * @param LinkRenderer $linkRenderer + */ function __construct( $form, $conds = [], $type, $level, $namespace, - $sizetype = '', $size = 0, $indefonly = false, $cascadeonly = false, $noredirect = false + $sizetype = '', $size = 0, $indefonly = false, $cascadeonly = false, $noredirect = false, + LinkRenderer $linkRenderer ) { $this->mForm = $form; $this->mConds = $conds; @@ -292,6 +314,7 @@ $this->indefonly = (bool)$indefonly; $this->cascadeonly = (bool)$cascadeonly; $this->noredirect = (bool)$noredirect; + $this->linkRenderer = $linkRenderer; parent::__construct( $form->getContext() ); } @@ -354,8 +377,6 @@ /** @var $row object */ $row = $this->mCurrentRow; - $formatted = ''; - switch ( $field ) { case 'log_timestamp': // when timestamp is null, this is a old protection row @@ -384,7 +405,7 @@ ) ); } else { - $formatted = Linker::link( $title ); + $formatted = $this->linkRenderer->makeLink( $title ); } if ( !is_null( $row->page_len ) ) { $formatted .= $this->getLanguage()->getDirMark() . @@ -401,9 +422,9 @@ $value, /* User preference timezone */true ) ); $title = Title::makeTitleSafe( $row->page_namespace, $row->page_title ); if ( $this->getUser()->isAllowed( 'protect' ) && $title ) { - $changeProtection = Linker::linkKnown( + $changeProtection = $this->linkRenderer->makeKnownLink( $title, - $this->msg( 'protect_change' )->escaped(), + $this->msg( 'protect_change' )->text(), [], [ 'action' => 'unprotect' ] ); -- To view, visit https://gerrit.wikimedia.org/r/303088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I494caccfff4fb0510f26554395150e59c728c5a1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits