Merge "Convert Special:DeletedContributions to use OOUI."

[lhc/web/wiklou.git] / includes / logging / DeleteLogFormatter.php

diff --git a/includes/logging/DeleteLogFormatter.php b/includes/logging/DeleteLogFormatter.php
index 012d53c..05973df 100644 (file)
--- a/includes/logging/DeleteLogFormatter.php
+++ b/includes/logging/DeleteLogFormatter.php
@@ -23,6 +23,8 @@
  * @since 1.22
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * This class formats delete log entries.
  *
@@ -54,12 +56,14 @@ class DeleteLogFormatter extends LogFormatter {
                        // 'filearchive' for file versions, or a comma-separated list of log_ids for log
                        // entries. $subtype here is 'revision' for page revisions and file
                        // versions, or 'event' for log entries.
-                       if ( ( $subtype === 'event' && count( $params ) === 6 )
-                               || ( $subtype === 'revision' && isset( $params[3] )
-                                       && ( $params[3] === 'revision' || $params[3] === 'oldimage'
-                                               || $params[3] === 'archive' || $params[3] === 'filearchive' )
+                       if (
+                               ( $subtype === 'event' && count( $params ) === 6 )
+                               || (
+                                       $subtype === 'revision' && isset( $params[3] )
+                                       && in_array( $params[3], [ 'revision', 'archive', 'oldimage', 'filearchive' ] )
                                )
                        ) {
+                               // See RevDelList::getLogParams()/RevDelLogList::getLogParams()
                                $paramStart = $subtype === 'revision' ? 4 : 3;
 
                                $old = $this->parseBitField( $params[$paramStart + 1] );
@@ -70,7 +74,8 @@ class DeleteLogFormatter extends LogFormatter {
                                foreach ( $hid as $v ) {
                                        $changes[] = $this->msg( "$v-hid" )->plain();
                                }
-                               // messages used: revdelete-content-unhid, revdelete-summary-unhid, revdelete-uname-unhid
+                               // messages used: revdelete-content-unhid, revdelete-summary-unhid,
+                               // revdelete-uname-unhid
                                foreach ( $unhid as $v ) {
                                        $changes[] = $this->msg( "$v-unhid" )->plain();
                                }
@@ -111,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 )
                ) {
@@ -119,14 +125,15 @@ class DeleteLogFormatter extends LogFormatter {
 
                switch ( $this->entry->getSubtype() ) {
                        case 'delete': // Show undelete link
+                       case 'delete_redir':
                                if ( $user->isAllowed( 'undelete' ) ) {
                                        $message = 'undeletelink';
                                } 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() ]
                                );
@@ -152,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] ),
@@ -163,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(),
@@ -177,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(),
@@ -202,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(),