Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace Linker::link() usage with LinkRenderer

Browse source 
Bug: T149346
Change-Id: Ie384566617f18ad6c3bf836b39702365d59f714d
This commit is contained in:
Haikal Izzuddin 2016-11-30 09:07:37 +08:00 committed by Kunal Mehta
parent 00c8d18575
commit 2c657ec256
10 changed files with 81 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/actions/CreditsAction.php
View file

@ -23,6 +23,8 @@
* @author <evan@wikitravel.org>
*/
use MediaWiki\MediaWikiServices;
/**
* @ingroup Actions
*/
@ -198,14 +200,15 @@ class CreditsAction extends FormlessAction {
if ( $this->canShowRealUserName() && !$user->isAnon() ) {
$real = $user->getRealName();
} else {
$real = false;
$real = $user->getName();
}
$page = $user->isAnon()
? SpecialPage::getTitleFor( 'Contributions', $user->getName() )
: $user->getUserPage();
return Linker::link( $page, htmlspecialchars( $real ? $real : $user->getName() ) );
return MediaWikiServices::getInstance()
->getLinkRenderer()->makeLink( $page, $real );
}
/**
@ -231,9 +234,9 @@ class CreditsAction extends FormlessAction {
* @return string HTML link
*/
protected function othersLink() {
return Linker::linkKnown(
return MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$this->msg( 'others' )->escaped(),
$this->msg( 'others' )->text(),
[],
[ 'action' => 'credits' ]
);

22
includes/actions/HistoryAction.php
View file

@ -23,6 +23,8 @@
* @ingroup Actions
*/
use MediaWiki\MediaWikiServices;
/**
* This class handles printing the history page for an article. In order to
* be efficient, it uses timestamps rather than offsets for paging, to avoid
@ -58,9 +60,9 @@ class HistoryAction extends FormlessAction {
protected function getDescription() {
// Creation of a subtitle link pointing to [[Special:Log]]
return Linker::linkKnown(
return MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
SpecialPage::getTitleFor( 'Log' ),
$this->msg( 'viewpagelogs' )->escaped(),
$this->msg( 'viewpagelogs' )->text(),
[],
[ 'page' => $this->getTitle()->getPrefixedText() ]
);
@ -734,9 +736,9 @@ class HistoryPager extends ReverseChronologicalPager {
$undoTooltip = $latest
? [ 'title' => $this->msg( 'tooltip-undo' )->text() ]
: [];
$undolink = Linker::linkKnown(
$undolink = MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$this->msg( 'editundo' )->escaped(),
$this->msg( 'editundo' )->text(),
$undoTooltip,
[
'action' => 'edit',
@ -788,16 +790,15 @@ class HistoryPager extends ReverseChronologicalPager {
*/
function revLink( $rev ) {
$date = $this->getLanguage()->userTimeAndDate( $rev->getTimestamp(), $this->getUser() );
$date = htmlspecialchars( $date );
if ( $rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
$link = Linker::linkKnown(
$link = MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$date,
[ 'class' => 'mw-changeslist-date' ],
[ 'oldid' => $rev->getId() ]
);
} else {
$link = $date;
$link = htmlspecialchars( $date );
}
if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
$link = "<span class=\"history-deleted\">$link</span>";
@ -818,7 +819,7 @@ class HistoryPager extends ReverseChronologicalPager {
if ( $latest || !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
return $cur;
} else {
return Linker::linkKnown(
return MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$cur,
[],
@ -847,9 +848,10 @@ class HistoryPager extends ReverseChronologicalPager {
return $last;
}
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
if ( $next === 'unknown' ) {
# Next row probably exists but is unknown, use an oldid=prev link
return Linker::linkKnown(
return $linkRenderer->makeKnownLink(
$this->getTitle(),
$last,
[],
@ -868,7 +870,7 @@ class HistoryPager extends ReverseChronologicalPager {
return $last;
}
return Linker::linkKnown(
return $linkRenderer->makeKnownLink(
$this->getTitle(),
$last,
[],

37
includes/actions/InfoAction.php
View file

@ -230,11 +230,11 @@ class InfoAction extends FormlessAction {
if ( $title->isRedirect() ) {
$pageInfo['header-basic'][] = [
$this->msg( 'pageinfo-redirectsto' ),
Linker::link( $this->page->getRedirectTarget() ) .
$linkRenderer->makeLink( $this->page->getRedirectTarget() ) .
$this->msg( 'word-separator' )->escaped() .
$this->msg( 'parentheses' )->rawParams( Linker::link(
$this->msg( 'parentheses' )->rawParams( $linkRenderer->makeLink(
$this->page->getRedirectTarget(),
$this->msg( 'pageinfo-redirectsto-info' )->escaped(),
$this->msg( 'pageinfo-redirectsto-info' )->text(),
[],
[ 'action' => 'info' ]
) )->escaped()
@ -266,9 +266,9 @@ class InfoAction extends FormlessAction {
) {
// Link to Special:PageLanguage with pre-filled page title if user has permissions
$titleObj = SpecialPage::getTitleFor( 'PageLanguage', $title->getPrefixedText() );
$langDisp = Linker::link(
$langDisp = $linkRenderer->makeLink(
$titleObj,
$this->msg( 'pageinfo-language' )->escaped()
$this->msg( 'pageinfo-language' )->text()
);
} else {
// Display just the message
@ -360,9 +360,9 @@ class InfoAction extends FormlessAction {
// Redirects to this page
$whatLinksHere = SpecialPage::getTitleFor( 'Whatlinkshere', $title->getPrefixedText() );
$pageInfo['header-basic'][] = [
Linker::link(
$linkRenderer->makeLink(
$whatLinksHere,
$this->msg( 'pageinfo-redirects-name' )->escaped(),
$this->msg( 'pageinfo-redirects-name' )->text(),
[],
[
'hidelinks' => 1,
@ -436,7 +436,7 @@ class InfoAction extends FormlessAction {
foreach ( $sources as $sourceTitle ) {
$cascadingFrom .= Html::rawElement(
'li', [], Linker::linkKnown( $sourceTitle ) );
'li', [], $linkRenderer->makeKnownLink( $sourceTitle ) );
}
$cascadingFrom = Html::rawElement( 'ul', [], $cascadingFrom );
@ -525,9 +525,9 @@ class InfoAction extends FormlessAction {
// Date of page creation
$pageInfo['header-edits'][] = [
$this->msg( 'pageinfo-firsttime' ),
Linker::linkKnown(
$linkRenderer->makeKnownLink(
$title,
htmlspecialchars( $lang->userTimeAndDate( $firstRev->getTimestamp(), $user ) ),
$lang->userTimeAndDate( $firstRev->getTimestamp(), $user ),
[],
[ 'oldid' => $firstRev->getId() ]
)
@ -544,11 +544,9 @@ class InfoAction extends FormlessAction {
// Date of latest edit
$pageInfo['header-edits'][] = [
$this->msg( 'pageinfo-lasttime' ),
Linker::linkKnown(
$linkRenderer->makeKnownLink(
$title,
htmlspecialchars(
$lang->userTimeAndDate( $this->page->getTimestamp(), $user )
),
$lang->userTimeAndDate( $this->page->getTimestamp(), $user ),
[],
[ 'oldid' => $this->page->getLatest() ]
)
@ -655,9 +653,9 @@ class InfoAction extends FormlessAction {
if ( !$config->get( 'MiserMode' ) && $pageCounts['transclusion']['to'] > 0 ) {
if ( $pageCounts['transclusion']['to'] > count( $transcludedTargets ) ) {
$more = Linker::link(
$more = $linkRenderer->makeLink(
$whatLinksHere,
$this->msg( 'moredotdotdot' )->escaped(),
$this->msg( 'moredotdotdot' )->text(),
[],
[ 'hidelinks' => 1, 'hideredirs' => 1 ]
);
@ -836,6 +834,7 @@ class InfoAction extends FormlessAction {
$real_names = [];
$user_names = [];
$anon_ips = [];
$linkRenderer = MediaWikiServices::getLinkRenderer();
# Sift for real versus user names
/** @var $user User */
@ -846,11 +845,11 @@ class InfoAction extends FormlessAction {
$hiddenPrefs = $this->context->getConfig()->get( 'HiddenPrefs' );
if ( $user->getId() == 0 ) {
$anon_ips[] = Linker::link( $page, htmlspecialchars( $user->getName() ) );
$anon_ips[] = $linkRenderer->makeLink( $page, $user->getName() );
} elseif ( !in_array( 'realname', $hiddenPrefs ) && $user->getRealName() ) {
$real_names[] = Linker::link( $page, htmlspecialchars( $user->getRealName() ) );
$real_names[] = $linkRenderer->makeLink( $page, $user->getRealName() );
} else {
$user_names[] = Linker::link( $page, htmlspecialchars( $user->getName() ) );
$user_names[] = $linkRenderer->makeLink( $page, $user->getName() );
}
}

7
includes/actions/MarkpatrolledAction.php
View file

@ -20,6 +20,8 @@
* @ingroup Actions
*/
use MediaWiki\MediaWikiServices;
/**
* Mark a revision as patrolled on a page
*
@ -56,6 +58,7 @@ class MarkpatrolledAction extends FormAction {
protected function preText() {
$rc = $this->getRecentChange();
$title = $rc->getTitle();
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
// Based on logentry-patrol-patrol (see PatrolLogFormatter)
$revId = $rc->getAttribute( 'rc_this_oldid' );
@ -64,8 +67,8 @@ class MarkpatrolledAction extends FormAction {
'diff' => $revId,
'oldid' => $rc->getAttribute( 'rc_last_oldid' )
];
$revlink = Linker::link( $title, htmlspecialchars( $revId ), [], $query );
$pagelink = Linker::link( $title, htmlspecialchars( $title->getPrefixedText() ) );
$revlink = $linkRenderer->makeLink( $title, $revId, [], $query );
$pagelink = $linkRenderer->makeLink( $title, $title->getPrefixedText() );
return $this->msg( 'confirm-markpatrolled-top' )->params(
$title->getPrefixedText(),

6
includes/cache/CacheHelper.php vendored
View file

@ -82,6 +82,8 @@ interface ICacheHelper {
function setExpiry( $cacheExpiry );
}
use MediaWiki\MediaWikiServices;
/**
* Helper class for caching various elements in a single cache entry.
*
@ -217,9 +219,9 @@ class CacheHelper implements ICacheHelper {
$subPage = explode( '/', $subPage, 2 );
$subPage = count( $subPage ) > 1 ? $subPage[1] : false;
$message .= ' ' . Linker::link(
$message .= ' ' . MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
$context->getTitle( $subPage ),
$context->msg( 'cachedspecial-refresh-now' )->escaped(),
$context->msg( 'cachedspecial-refresh-now' )->text(),
[],
$refreshArgs
);

6
includes/changetags/ChangeTagsLogItem.php
View file

@ -19,6 +19,8 @@
* @ingroup Change tagging
*/
use MediaWiki\MediaWikiServices;
/**
* Item class for a logging table row with its associated change tags.
* @todo Abstract out a base class for this and RevDelLogItem, similar to the
@ -70,9 +72,9 @@ class ChangeTagsLogItem extends RevisionItemBase {
$formatter->setAudience( LogFormatter::FOR_THIS_USER );
// Log link for this page
$loglink = Linker::link(
$loglink = MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 'Log' ),
$this->list->msg( 'log' )->escaped(),
$this->list->msg( 'log' )->text(),
[],
[ 'page' => $title->getPrefixedText() ]
);

11
includes/logging/BlockLogFormatter.php
View file

@ -22,6 +22,8 @@
* @since 1.25
*/
use MediaWiki\MediaWikiServices;
/**
* This class formats block log entries.
*
@ -91,6 +93,7 @@ class BlockLogFormatter extends LogFormatter {
public function getActionLinks() {
$subtype = $this->entry->getSubtype();
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
if ( $this->entry->isDeleted( LogPage::DELETED_ACTION ) // Action is hidden
|| !( $subtype === 'block' || $subtype === 'reblock' )
|| !$this->context->getUser()->isAllowed( 'block' )
@ -101,13 +104,13 @@ class BlockLogFormatter extends LogFormatter {
// Show unblock/change block link
$title = $this->entry->getTarget();
$links = [
Linker::linkKnown(
$linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Unblock', $title->getDBkey() ),
$this->msg( 'unblocklink' )->escaped()
$this->msg( 'unblocklink' )->text()
),
Linker::linkKnown(
$linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Block', $title->getDBkey() ),
$this->msg( 'change-blocklink' )->escaped()
$this->msg( 'change-blocklink' )->text()
)
];

6
includes/logging/ContentModelLogFormatter.php
View file

@ -1,5 +1,7 @@
<?php
use MediaWiki\MediaWikiServices;
class ContentModelLogFormatter extends LogFormatter {
protected function getMessageParameters() {
$lang = $this->context->getLanguage();
@ -18,9 +20,9 @@ class ContentModelLogFormatter extends LogFormatter {
}
$params = $this->extractParameters();
$revert = Linker::linkKnown(
$revert = MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
SpecialPage::getTitleFor( 'ChangeContentModel' ),
$this->msg( 'logentry-contentmodel-change-revertlink' )->escaped(),
$this->msg( 'logentry-contentmodel-change-revertlink' )->text(),
[],
[
'pagetitle' => $this->entry->getTarget()->getPrefixedText(),

23
includes/logging/DeleteLogFormatter.php
View file

@ -23,6 +23,8 @@
* @since 1.22
*/
use MediaWiki\MediaWikiServices;
/**
* This class formats delete log entries.
*
@ -114,6 +116,7 @@ class DeleteLogFormatter extends LogFormatter {
public function getActionLinks() {
$user = $this->context->getUser();
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
if ( !$user->isAllowed( 'deletedhistory' )
|| $this->entry->isDeleted( LogPage::DELETED_ACTION )
) {
@ -128,9 +131,9 @@ class DeleteLogFormatter extends LogFormatter {
} else {
$message = 'undeleteviewlink';
}
$revert = Linker::linkKnown(
$revert = $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Undelete' ),
$this->msg( $message )->escaped(),
$this->msg( $message )->text(),
[],
[ 'target' => $this->entry->getTarget()->getPrefixedDBkey() ]
);
@ -156,9 +159,9 @@ class DeleteLogFormatter extends LogFormatter {
if ( count( $ids ) == 1 ) {
// Live revision diffs...
if ( $key == 'oldid' || $key == 'revision' ) {
$links[] = Linker::linkKnown(
$links[] = $linkRenderer->makeKnownLink(
$this->entry->getTarget(),
$this->msg( 'diff' )->escaped(),
$this->msg( 'diff' )->text(),
[],
[
'diff' => intval( $ids[0] ),
@ -167,9 +170,9 @@ class DeleteLogFormatter extends LogFormatter {
);
// Deleted revision diffs...
} elseif ( $key == 'artimestamp' || $key == 'archive' ) {
$links[] = Linker::linkKnown(
$links[] = $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Undelete' ),
$this->msg( 'diff' )->escaped(),
$this->msg( 'diff' )->text(),
[],
[
'target' => $this->entry->getTarget()->getPrefixedDBkey(),
@ -181,9 +184,9 @@ class DeleteLogFormatter extends LogFormatter {
}
// View/modify link...
$links[] = Linker::linkKnown(
$links[] = $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Revisiondelete' ),
$this->msg( 'revdel-restore' )->escaped(),
$this->msg( 'revdel-restore' )->text(),
[],
[
'target' => $this->entry->getTarget()->getPrefixedText(),
@ -206,9 +209,9 @@ class DeleteLogFormatter extends LogFormatter {
$query = implode( ',', $query );
}
// Link to each hidden object ID, $params[1] is the url param
$revert = Linker::linkKnown(
$revert = $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Revisiondelete' ),
$this->msg( 'revdel-restore' )->escaped(),
$this->msg( 'revdel-restore' )->text(),
[],
[
'target' => $this->entry->getTarget()->getPrefixedText(),

11
includes/logging/LogEventsList.php
View file

@ -23,6 +23,8 @@
* @file
*/
use MediaWiki\MediaWikiServices;
class LogEventsList extends ContextSource {
const NO_ACTION_LINK = 1;
const NO_EXTRA_USER_LINKS = 2;
@ -142,10 +144,11 @@ class LogEventsList extends ContextSource {
*/
private function getFilterLinks( $filter ) {
// show/hide links
$messages = [ $this->msg( 'show' )->escaped(), $this->msg( 'hide' )->escaped() ];
$messages = [ $this->msg( 'show' )->text(), $this->msg( 'hide' )->text() ];
// Option value -> message mapping
$links = [];
$hiddens = ''; // keep track for "go" button
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
foreach ( $filter as $type => $val ) {
// Should the below assignment be outside the foreach?
// Then it would have to be copied. Not certain what is more expensive.
@ -155,7 +158,7 @@ class LogEventsList extends ContextSource {
$hideVal = 1 - intval( $val );
$query[$queryKey] = $hideVal;
$link = Linker::linkKnown(
$link = $linkRenderer->makeKnownLink(
$this->getTitle(),
$messages[$hideVal],
[],
@ -672,9 +675,9 @@ class LogEventsList extends ContextSource {
$urlParam = array_merge( $urlParam, $extraUrlParams );
}
$s .= Linker::linkKnown(
$s .= MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
SpecialPage::getTitleFor( 'Log' ),
$context->msg( 'log-fulllog' )->escaped(),
$context->msg( 'log-fulllog' )->text(),
[],
$urlParam
);