[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace Linker::link() with LinkRenderer in all revisiondele...

2016-12-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace Linker::link() with LinkRenderer in all revisiondelete 
pages
..


Replace Linker::link() with LinkRenderer in all revisiondelete pages

* RevDelArchiveItem
* RevDelArchivedFileItem
* RevDelFileItem
* RevDelLogItem
* RevDelRevisionItem

Bug: T149346
Change-Id: I96f83d06b4d3ccf3f76ccfca843a6aaf76d89063
---
M includes/RevisionList.php
M includes/revisiondelete/RevDelArchiveItem.php
M includes/revisiondelete/RevDelArchivedFileItem.php
M includes/revisiondelete/RevDelFileItem.php
M includes/revisiondelete/RevDelLogItem.php
M includes/revisiondelete/RevDelRevisionItem.php
6 files changed, 33 insertions(+), 23 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/RevisionList.php b/includes/RevisionList.php
index fb444bd..052fd16 100644
--- a/includes/RevisionList.php
+++ b/includes/RevisionList.php
@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * List for revision table items for a single page
  */
@@ -268,6 +270,14 @@
 * This is used to show the list in HTML form, by the special page.
 */
abstract public function getHTML();
+
+   /**
+* Returns an instance of LinkRenderer
+* @return \MediaWiki\Linker\LinkRenderer
+*/
+   protected function getLinkRenderer() {
+   return MediaWikiServices::getInstance()->getLinkRenderer();
+   }
 }
 
 class RevisionList extends RevisionListBase {
diff --git a/includes/revisiondelete/RevDelArchiveItem.php 
b/includes/revisiondelete/RevDelArchiveItem.php
index 2d0d690..ab74dbd 100644
--- a/includes/revisiondelete/RevDelArchiveItem.php
+++ b/includes/revisiondelete/RevDelArchiveItem.php
@@ -68,14 +68,14 @@
}
 
protected function getRevisionLink() {
-   $date = htmlspecialchars( 
$this->list->getLanguage()->userTimeAndDate(
-   $this->revision->getTimestamp(), $this->list->getUser() 
) );
+   $date = $this->list->getLanguage()->userTimeAndDate(
+   $this->revision->getTimestamp(), $this->list->getUser() 
);
 
if ( $this->isDeleted() && !$this->canViewContent() ) {
-   return $date;
+   return htmlspecialchars( $date );
}
 
-   return Linker::link(
+   return $this->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 'Undelete' ),
$date,
[],
@@ -91,9 +91,9 @@
return $this->list->msg( 'diff' )->escaped();
}
 
-   return Linker::link(
+   return $this->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 'Undelete' ),
-   $this->list->msg( 'diff' )->escaped(),
+   $this->list->msg( 'diff' )->text(),
[],
[
'target' => 
$this->list->title->getPrefixedText(),
diff --git a/includes/revisiondelete/RevDelArchivedFileItem.php 
b/includes/revisiondelete/RevDelArchivedFileItem.php
index 52df2e3..decabba 100644
--- a/includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/includes/revisiondelete/RevDelArchivedFileItem.php
@@ -69,16 +69,16 @@
}
 
protected function getLink() {
-   $date = htmlspecialchars( 
$this->list->getLanguage()->userTimeAndDate(
-   $this->file->getTimestamp(), $this->list->getUser() ) );
+   $date = $this->list->getLanguage()->userTimeAndDate(
+   $this->file->getTimestamp(), $this->list->getUser() );
 
# Hidden files...
if ( !$this->canViewContent() ) {
-   $link = $date;
+   $link = htmlspecialchars( $date );
} else {
$undelete = SpecialPage::getTitleFor( 'Undelete' );
$key = $this->file->getKey();
-   $link = Linker::link( $undelete, $date, [],
+   $link = $this->getLinkRenderer()->makeLink( $undelete, 
$date, [],
[
'target' => 
$this->list->title->getPrefixedText(),
'file' => $key,
diff --git a/includes/revisiondelete/RevDelFileItem.php 
b/includes/revisiondelete/RevDelFileItem.php
index ff01cee..06b596e 100644
--- a/includes/revisiondelete/RevDelFileItem.php
+++ b/includes/revisiondelete/RevDelFileItem.php
@@ -116,19 +116,19 @@
 * @return string
 */
protected function getLink() {
-   $date = htmlspecialchars( 
$this->list->getLanguage()->userTimeAndDate(
-   $this->file->getTimestamp(),

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace Linker::link() with LinkRenderer in all revisiondele...

2016-12-05 Thread Divadsn (Code Review) 
Divadsn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325348

Change subject: Replace Linker::link() with LinkRenderer in all revisiondelete 
pages
..

Replace Linker::link() with LinkRenderer in all revisiondelete pages

* RevDelArchiveItem
* RevDelArchivedFileItem
* RevDelFileItem
* RevDelLogItem
* RevDelRevisionItem

Bug: T149346
Change-Id: I96f83d06b4d3ccf3f76ccfca843a6aaf76d89063
---
M includes/revisiondelete/RevDelArchiveItem.php
M includes/revisiondelete/RevDelArchivedFileItem.php
M includes/revisiondelete/RevDelFileItem.php
M includes/revisiondelete/RevDelLogItem.php
M includes/revisiondelete/RevDelRevisionItem.php
5 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/325348/1

diff --git a/includes/revisiondelete/RevDelArchiveItem.php 
b/includes/revisiondelete/RevDelArchiveItem.php
index 2d0d690..fdfe184 100644
--- a/includes/revisiondelete/RevDelArchiveItem.php
+++ b/includes/revisiondelete/RevDelArchiveItem.php
@@ -75,7 +75,7 @@
return $date;
}
 
-   return Linker::link(
+   return $this->getLinkRenderer->makeLink(
SpecialPage::getTitleFor( 'Undelete' ),
$date,
[],
@@ -91,7 +91,7 @@
return $this->list->msg( 'diff' )->escaped();
}
 
-   return Linker::link(
+   return $this->getLinkRenderer->makeLink(
SpecialPage::getTitleFor( 'Undelete' ),
$this->list->msg( 'diff' )->escaped(),
[],
diff --git a/includes/revisiondelete/RevDelArchivedFileItem.php 
b/includes/revisiondelete/RevDelArchivedFileItem.php
index 52df2e3..7c72316 100644
--- a/includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/includes/revisiondelete/RevDelArchivedFileItem.php
@@ -78,7 +78,7 @@
} else {
$undelete = SpecialPage::getTitleFor( 'Undelete' );
$key = $this->file->getKey();
-   $link = Linker::link( $undelete, $date, [],
+   $link = $this->getLinkRenderer->makeLink( $undelete, 
$date, [],
[
'target' => 
$this->list->title->getPrefixedText(),
'file' => $key,
diff --git a/includes/revisiondelete/RevDelFileItem.php 
b/includes/revisiondelete/RevDelFileItem.php
index ff01cee..06399ee 100644
--- a/includes/revisiondelete/RevDelFileItem.php
+++ b/includes/revisiondelete/RevDelFileItem.php
@@ -128,7 +128,7 @@
if ( !$this->canViewContent() ) {
$link = $date;
} else {
-   $link = Linker::link(
+   $link = $this->getLinkRenderer->makeLink(
SpecialPage::getTitleFor( 'Revisiondelete' ),
$date,
[],
diff --git a/includes/revisiondelete/RevDelLogItem.php 
b/includes/revisiondelete/RevDelLogItem.php
index 1ea7271..d53198a 100644
--- a/includes/revisiondelete/RevDelLogItem.php
+++ b/includes/revisiondelete/RevDelLogItem.php
@@ -92,7 +92,7 @@
$formatter->setAudience( LogFormatter::FOR_THIS_USER );
 
// Log link for this page
-   $loglink = Linker::link(
+   $loglink = $this->getLinkRenderer->makeLink(
SpecialPage::getTitleFor( 'Log' ),
$this->list->msg( 'log' )->escaped(),
[],
diff --git a/includes/revisiondelete/RevDelRevisionItem.php 
b/includes/revisiondelete/RevDelRevisionItem.php
index d799113..8cd5320 100644
--- a/includes/revisiondelete/RevDelRevisionItem.php
+++ b/includes/revisiondelete/RevDelRevisionItem.php
@@ -114,7 +114,7 @@
return $date;
}
 
-   return Linker::linkKnown(
+   return $this->getLinkRenderer->makeKnownLink(
$this->list->title,
$date,
[],
@@ -134,7 +134,7 @@
if ( $this->isDeleted() && !$this->canViewContent() ) {
return $this->list->msg( 'diff' )->escaped();
} else {
-   return Linker::linkKnown(
+   return $this->getLinkRenderer->makeKnownLink(
$this->list->title,
$this->list->msg( 'diff' )->escaped(),
[],

-- 
To view, visit https://gerrit.wikimedia.org/r/325348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: