X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flogging%2FMergeLogFormatter.php;h=b0edd4c07f653ed997bf50b8703ab6dadb952cfe;hb=a8ec960e9d910acbcd0d50efad3bd73e3ae812aa;hp=6763dbd19f99132d3279de70edddb9b9448652ed;hpb=dd8c1e2dd3feb9c5c6bd79d2a8a3356666792d0c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/logging/MergeLogFormatter.php b/includes/logging/MergeLogFormatter.php
index 6763dbd19f..b0edd4c07f 100644
--- 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 );
@@ -57,15 +57,35 @@ class MergeLogFormatter extends LogFormatter {
 		$revert = Linker::linkKnown(
 			SpecialPage::getTitleFor( 'MergeHistory' ),
 			$this->msg( 'revertmerge' )->escaped(),
-			array(),
-			array(
+			[],
+			[
 				'target' => $params[3],
 				'dest' => $this->entry->getTarget()->getPrefixedDBkey(),
 				'mergepoint' => $params[4],
 				'submitted' => 1 // show the revisions immediately
-			)
+			]
 		);
 
 		return $this->msg( 'parentheses' )->rawParams( $revert )->escaped();
 	}
+
+	protected function getParametersForApi() {
+		$entry = $this->entry;
+		$params = $entry->getParameters();
+
+		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];
+				unset( $params[$index] );
+			}
+		}
+
+		return $params;
+	}
 }