X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flogging%2FMergeLogFormatter.php;h=36e383b069bb7bcc909834f6112bffc5b12502e5;hb=dc78d4d12c7a7b2e0135add4e634ff4a51ead5e1;hp=263d37ad79b2cbab0e71844785145b93e047a81d;hpb=8d5680285f73f15a4981f90e82acb00679b38359;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/logging/MergeLogFormatter.php b/includes/logging/MergeLogFormatter.php
index 263d37ad79..36e383b069 100644
--- 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;
 	}
 
@@ -67,4 +68,24 @@ class MergeLogFormatter extends LogFormatter {
 
 		return $this->msg( 'parentheses' )->rawParams( $revert )->escaped();
 	}
+
+	protected function getParametersForApi() {
+		$entry = $this->entry;
+		$params = $entry->getParameters();
+
+		static $map = array(
+			'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];
+				unset( $params[$index] );
+			}
+		}
+
+		return $params;
+	}
 }