jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328489 )
Change subject: Replaced Linker::link() usages with LinkRenderer
......................................................................
Replaced Linker::link() usages with LinkRenderer
Bug: T149346
Change-Id: I0c79990e44aaa0c5b1916cacef410bc5ab8fff7b
---
M ArticleFeedbackv5.hooks.php
M ArticleFeedbackv5.log.php
M ArticleFeedbackv5.render.php
M SpecialArticleFeedbackv5.php
M api/ApiViewActivityArticleFeedbackv5.php
5 files changed, 36 insertions(+), 24 deletions(-)
Approvals:
Filip: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php
index d4f2097..5b22d6c 100644
--- a/ArticleFeedbackv5.hooks.php
+++ b/ArticleFeedbackv5.hooks.php
@@ -1,4 +1,7 @@
<?php
+
+use MediaWiki\MediaWikiServices;
+
/**
* Hooks for ArticleFeedback
*
@@ -506,13 +509,12 @@
$dateFormats['date'] = $lang->userDate( $record->aft_timestamp,
$user );
$dateFormats['time'] = $lang->userTime( $record->aft_timestamp,
$user );
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
+
// if feedback should be hidden from users, a special class
"history-deleted" should be added
$historyDeleted = ( $record->isHidden() ||
$record->isRequested() || $record->isOversighted() );
foreach ( $dateFormats as $format => &$formattedTime ) {
- $formattedTime = Linker::link(
- $feedbackTitle,
- htmlspecialchars( $formattedTime )
- );
+ $formattedTime = $linkRenderer->makeLink(
$feedbackTitle, $formattedTime );
if ( $historyDeleted ) {
$formattedTime = '<span
class="history-deleted">' . $formattedTime . '</span>';
}
diff --git a/ArticleFeedbackv5.log.php b/ArticleFeedbackv5.log.php
index a6374de..ab3982b 100644
--- a/ArticleFeedbackv5.log.php
+++ b/ArticleFeedbackv5.log.php
@@ -1,4 +1,7 @@
<?php
+
+use MediaWiki\MediaWikiServices;
+
/**
* This class formats all articlefeedbackv5log entries.
*
@@ -179,9 +182,9 @@
*/
public function getActionLinks() {
$links = array(
- Linker::link(
+
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
$this->entry->getTarget(),
- $this->msg( 'hist' )->escaped(),
+ $this->msg( 'hist' )->text(),
array(),
array(
'action' => 'history',
diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index c95635e..01c952e 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -9,6 +9,8 @@
* @version $Id$
*/
+use MediaWiki\MediaWikiServices;
+
/**
* Handles rendering of a submitted feedback entry in the Special page's list
view
*
@@ -383,6 +385,7 @@
*/
private function feedbackHead( $message, $record ) {
$anonMessage = '';
+ $linkRender =
MediaWikiServices::getInstance()->getLinkRenderer();
// User info
if ( $record->aft_user == 0 ) {
@@ -394,7 +397,7 @@
// IPv4 - display the same way regular users
are displayed
// display name = visitor's ip
- $userName = Linker::link( $title,
htmlspecialchars( $record->aft_user_text ) );
+ $userName = $linkRender->makeLink( $title,
$record->aft_user_text );
} else {
// not IPv4 - display IP on next line (since
IPv6 is rather long, it'd break our display)
@@ -402,7 +405,7 @@
$userName = wfMessage(
'articlefeedbackv5-form-anon-username' )->escaped();
// additional line to be printed with the IPv6
address (with link to contributions)
- $userLink = Linker::link( $title,
htmlspecialchars( $record->aft_user_text ) );
+ $userLink = $linkRender->makeLink( $title,
$record->aft_user_text );
$anonMessage = wfMessage(
'articlefeedbackv5-form-anon-message' )->rawParams( $userLink )->escaped();
}
} else {
@@ -417,7 +420,7 @@
}
// display name = username
- $userName = Linker::link( $title, htmlspecialchars(
$record->aft_user_text ) );
+ $userName = $linkRender->makeLink( $title,
$record->aft_user_text );
}
if ( $this->isCentral ) {
@@ -472,9 +475,9 @@
Html::rawElement(
'span',
array( 'class' =>
'articleFeedbackv5-comment-details-link' ),
- Linker::link(
+
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor(
'ArticleFeedbackv5', $title->getPrefixedDBkey() .'/'. $record->aft_id ),
- wfMessage(
'articleFeedbackv5-details-link' )->escaped()
+ wfMessage(
'articleFeedbackv5-details-link' )->text()
)
);
}
@@ -1127,9 +1130,9 @@
Html::rawElement(
'p',
array( 'class' =>
'articleFeedbackv5-old-revision' ),
- Linker::link(
+
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
Title::newFromID(
$record->aft_page ),
- wfMessage(
'articlefeedbackv5-permalink-info-revision-link' )->escaped(),
+ wfMessage(
'articlefeedbackv5-permalink-info-revision-link' )->text(),
array(),
array( 'oldid' =>
$record->aft_page_revision )
)
diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php
index 66a3532..5365829 100644
--- a/SpecialArticleFeedbackv5.php
+++ b/SpecialArticleFeedbackv5.php
@@ -272,14 +272,15 @@
// build link to page & talk page
$pageLinks = '';
if ( $this->pageId ) {
+ $linkRenderer = $this->getLinkRenderer();
$pageLinks =
- Linker::link(
+ $linkRenderer->makeLink(
$this->title,
- $this->msg(
'articlefeedbackv5-go-to-article' )->escaped()
+ $this->msg(
'articlefeedbackv5-go-to-article' )->text()
) . ' ' .
- Linker::link(
+ $linkRenderer->makeLink(
$this->title->getTalkPage(),
- $this->msg(
'articlefeedbackv5-discussion-page' )->escaped()
+ $this->msg(
'articlefeedbackv5-discussion-page' )->text()
) . ' ' .
Html::element(
'a',
@@ -578,13 +579,14 @@
* @return string
*/
protected function buildPermalink( $renderer, $record ) {
+ $linkRenderer = $this->getLinkRenderer();
return
Html::rawElement(
'div',
array( 'class' =>
'articleFeedbackv5-feedback-permalink-goback' ),
- Linker::link(
+ $linkRenderer->makeLink(
SpecialPage::getTitleFor(
'ArticleFeedbackv5', $this->title->getPrefixedDBkey() ),
- '‹ ' . $this->msg(
'articlefeedbackv5-special-goback' )->escaped()
+ '‹ ' . $this->msg(
'articlefeedbackv5-special-goback' )->text()
)
) .
Html::rawElement(
@@ -595,9 +597,9 @@
Html::rawElement(
'div',
array( 'class' =>
'articleFeedbackv5-feedback-permalink-goback' ),
- Linker::link(
+ $linkRenderer->makeLink(
SpecialPage::getTitleFor(
'ArticleFeedbackv5', $this->title->getPrefixedDBkey() ),
- '‹ ' . $this->msg(
'articlefeedbackv5-special-goback' )->escaped()
+ '‹ ' . $this->msg(
'articlefeedbackv5-special-goback' )->text()
)
);
}
@@ -623,9 +625,9 @@
Html::rawElement(
'div',
array( 'class' =>
'articleFeedbackv5-feedback-central-goback' ),
- Linker::link(
+ $this->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor(
'ArticleFeedbackv5' ),
- $this->msg(
'articlefeedbackv5-special-central-goback' )->escaped()
+ $this->msg(
'articlefeedbackv5-special-central-goback' )->text()
)
);
}
diff --git a/api/ApiViewActivityArticleFeedbackv5.php
b/api/ApiViewActivityArticleFeedbackv5.php
index be0b637..b3ab0ea 100644
--- a/api/ApiViewActivityArticleFeedbackv5.php
+++ b/api/ApiViewActivityArticleFeedbackv5.php
@@ -8,6 +8,8 @@
* @version $Id$
*/
+use MediaWiki\MediaWikiServices;
+
/**
* This class pulls the aggregated ratings for display in Bucket #5
*
@@ -109,7 +111,7 @@
Html::rawElement(
'div',
array( 'class' =>
'articleFeedbackv5-activity-feedback-permalink' ),
- Linker::link(
+
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 'ArticleFeedbackv5', $page->getPrefixedDBkey() . '/'
. $feedback->aft_id ),
wfMessage(
'articlefeedbackv5-activity-permalink' )->text()
)
--
To view, visit https://gerrit.wikimedia.org/r/328489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c79990e44aaa0c5b1916cacef410bc5ab8fff7b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: LukBukkit <[email protected]>
Gerrit-Reviewer: Filip <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: LukBukkit <[email protected]>
Gerrit-Reviewer: MtDu <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
