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

diff --git a/includes/logging/MergeLogFormatter.php b/includes/logging/MergeLogFormatter.php
index 6763dbd19f..36e383b069 100644
--- a/includes/logging/MergeLogFormatter.php
+++ b/includes/logging/MergeLogFormatter.php
@@ -68,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;
+	}
 }