Merge "Drop index oi_name_archive_name on table oldimage"

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

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index b99cb41..68404bf 100644 (file)
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -167,7 +167,7 @@ class LogFormatter {
 
        /**
         * Even uglier hack to maintain backwards compatibilty with IRC bots
-        * (bug 34508).
+        * (T36508).
         * @see getActionText()
         * @return string Text
         */
@@ -188,7 +188,7 @@ class LogFormatter {
 
        /**
         * Even uglier hack to maintain backwards compatibilty with IRC bots
-        * (bug 34508).
+        * (T36508).
         * @see getActionText()
         * @return string Text
         */
@@ -353,7 +353,11 @@ class LogFormatter {
                                                        $rawDuration = $parameters['5::duration'];
                                                        $rawFlags = $parameters['6::flags'];
                                                }
-                                               $duration = $wgContLang->translateBlockExpiry( $rawDuration );
+                                               $duration = $wgContLang->translateBlockExpiry(
+                                                       $rawDuration,
+                                                       null,
+                                                       wfTimestamp( TS_UNIX, $entry->getTimestamp() )
+                                               );
                                                $flags = BlockLogFormatter::formatBlockFlags( $rawFlags, $wgContLang );
                                                $text = wfMessage( 'blocklogentry' )
                                                        ->rawParams( $target, $duration, $flags )->inContentLanguage()->escaped();
@@ -363,7 +367,11 @@ class LogFormatter {
                                                        ->rawParams( $target )->inContentLanguage()->escaped();
                                                break;
                                        case 'reblock':
-                                               $duration = $wgContLang->translateBlockExpiry( $parameters['5::duration'] );
+                                               $duration = $wgContLang->translateBlockExpiry(
+                                                       $parameters['5::duration'],
+                                                       null,
+                                                       wfTimestamp( TS_UNIX, $entry->getTimestamp() )
+                                               );
                                                $flags = BlockLogFormatter::formatBlockFlags( $parameters['6::flags'], $wgContLang );
                                                $text = wfMessage( 'reblock-logentry' )
                                                        ->rawParams( $target, $duration, $flags )->inContentLanguage()->escaped();
@@ -462,7 +470,7 @@ class LogFormatter {
         */
        protected function extractParameters() {
                $entry = $this->entry;
-               $params = array();
+               $params = [];
 
                if ( $entry->isLegacy() ) {
                        foreach ( $entry->getParameters() as $index => $value ) {
@@ -608,9 +616,9 @@ class LogFormatter {
         * @throws MWException
         * @return string
         */
-       protected function makePageLink( Title $title = null, $parameters = array(), $html = null ) {
+       protected function makePageLink( Title $title = null, $parameters = [], $html = null ) {
                if ( !$this->plaintext ) {
-                       $link = Linker::link( $title, $html, array(), $parameters );
+                       $link = Linker::link( $title, $html, [], $parameters );
                } else {
                        if ( !$title instanceof Title ) {
                                throw new MWException( "Expected title, got null" );
@@ -671,7 +679,7 @@ class LogFormatter {
                }
 
                $content = $this->msg( $message )->escaped();
-               $attribs = array( 'class' => 'history-deleted' );
+               $attribs = [ 'class' => 'history-deleted' ];
 
                return Html::rawElement( 'span', $attribs, $content );
        }
@@ -685,7 +693,7 @@ class LogFormatter {
                if ( $this->plaintext ) {
                        return $content;
                }
-               $attribs = array( 'class' => 'history-deleted' );
+               $attribs = [ 'class' => 'history-deleted' ];
 
                return Html::rawElement( 'span', $attribs, $content );
        }
@@ -726,7 +734,7 @@ class LogFormatter {
         * @return array Array of titles that should be preloaded with LinkBatch
         */
        public function getPreloadTitles() {
-               return array();
+               return [];
        }
 
        /**
@@ -763,7 +771,7 @@ class LogFormatter {
         * @return array
         */
        public function formatParametersForApi() {
-               $logParams = array();
+               $logParams = [];
                foreach ( $this->getParametersForApi() as $key => $value ) {
                        $vals = explode( ':', $key, 3 );
                        if ( count( $vals ) !== 3 ) {
@@ -820,7 +828,7 @@ class LogFormatter {
                                if ( $type === 'msg-content' ) {
                                        $msg->inContentLanguage();
                                }
-                               $value = array();
+                               $value = [];
                                $value["{$name}_key"] = $msg->getKey();
                                if ( $msg->getParams() ) {
                                        $value["{$name}_params"] = $msg->getParams();
@@ -832,7 +840,7 @@ class LogFormatter {
                        case 'title-link':
                                $title = Title::newFromText( $value );
                                if ( $title ) {
-                                       $value = array();
+                                       $value = [];
                                        ApiQueryBase::addTitleInfo( $value, $title, "{$name}_" );
                                }
                                return $value;
@@ -850,7 +858,7 @@ class LogFormatter {
                                break;
                }
 
-               return array( $name => $value );
+               return [ $name => $value ];
        }
 }
 
@@ -946,8 +954,8 @@ class LegacyLogFormatter extends LogFormatter {
 
                $params = $this->entry->getParameters();
 
-               Hooks::run( 'LogLine', array( $type, $subtype, $title, $params,
-                       &$this->comment, &$this->revert, $this->entry->getTimestamp() ) );
+               Hooks::run( 'LogLine', [ $type, $subtype, $title, $params,
+                       &$this->comment, &$this->revert, $this->entry->getTimestamp() ] );
 
                return $this->revert;
        }