Merge "Add namespace aliases for Luri (lrc)"

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

diff --git a/includes/logging/MergeLogFormatter.php b/includes/logging/MergeLogFormatter.php
index 263d37a..6763dbd 100644 (file)
--- a/includes/logging/MergeLogFormatter.php
+++ b/includes/logging/MergeLogFormatter.php
@@ -40,7 +40,8 @@ class MergeLogFormatter extends LogFormatter {
                $newname = $this->makePageLink( Title::newFromText( $params[3] ) );
                $params[2] = Message::rawParam( $oldname );
                $params[3] = Message::rawParam( $newname );
-               $params[4] = $this->context->getLanguage()->timeanddate( $params[4] );
+               $params[4] = $this->context->getLanguage()
+                       ->userTimeAndDate( $params[4], $this->context->getUser() );
                return $params;
        }