Merge "Rewrite pref cleanup script"

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

diff --git a/includes/logging/MergeLogFormatter.php b/includes/logging/MergeLogFormatter.php
index 36e383b..8775097 100644 (file)
--- a/includes/logging/MergeLogFormatter.php
+++ b/includes/logging/MergeLogFormatter.php
@@ -31,12 +31,12 @@ class MergeLogFormatter extends LogFormatter {
        public function getPreloadTitles() {
                $params = $this->extractParameters();
 
-               return array( Title::newFromText( $params[3] ) );
+               return [ Title::newFromText( $params[3] ) ];
        }
 
        protected function getMessageParameters() {
                $params = parent::getMessageParameters();
-               $oldname = $this->makePageLink( $this->entry->getTarget(), array( 'redirect' => 'no' ) );
+               $oldname = $this->makePageLink( $this->entry->getTarget(), [ 'redirect' => 'no' ] );
                $newname = $this->makePageLink( Title::newFromText( $params[3] ) );
                $params[2] = Message::rawParam( $oldname );
                $params[3] = Message::rawParam( $newname );
@@ -54,16 +54,16 @@ class MergeLogFormatter extends LogFormatter {
 
                // Show unmerge link
                $params = $this->extractParameters();
-               $revert = Linker::linkKnown(
+               $revert = $this->getLinkRenderer()->makeKnownLink(
                        SpecialPage::getTitleFor( 'MergeHistory' ),
-                       $this->msg( 'revertmerge' )->escaped(),
-                       array(),
-                       array(
+                       $this->msg( 'revertmerge' )->text(),
+                       [],
+                       [
                                'target' => $params[3],
                                'dest' => $this->entry->getTarget()->getPrefixedDBkey(),
                                'mergepoint' => $params[4],
                                'submitted' => 1 // show the revisions immediately
-                       )
+                       ]
                );
 
                return $this->msg( 'parentheses' )->rawParams( $revert )->escaped();
@@ -73,12 +73,12 @@ class MergeLogFormatter extends LogFormatter {
                $entry = $this->entry;
                $params = $entry->getParameters();
 
-               static $map = array(
+               static $map = [
                        '4:title:dest',
                        '5:timestamp:mergepoint',
                        '4::dest' => '4:title:dest',
                        '5::mergepoint' => '5:timestamp:mergepoint',
-               );
+               ];
                foreach ( $map as $index => $key ) {
                        if ( isset( $params[$index] ) ) {
                                $params[$key] = $params[$index];