X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flogging%2FMoveLogFormatter.php;h=43ca0ea1d5f67442cf7bc76a0efd666c455ef963;hb=52b74d44d522c2a1b67f9ccc2b8f7e44b6b52d7c;hp=39130163924f3b23ff757ed72980d1615c3d5596;hpb=93131fcd385cdae84ecb7ccb6faa1c7340214211;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/logging/MoveLogFormatter.php b/includes/logging/MoveLogFormatter.php
index 3913016392..43ca0ea1d5 100644
--- a/includes/logging/MoveLogFormatter.php
+++ b/includes/logging/MoveLogFormatter.php
@@ -32,13 +32,14 @@ class MoveLogFormatter extends LogFormatter {
 	public function getPreloadTitles() {
 		$params = $this->extractParameters();
 
-		return array( Title::newFromText( $params[3] ) );
+		return [ Title::newFromText( $params[3] ) ];
 	}
 
 	protected function getMessageKey() {
 		$key = parent::getMessageKey();
-		$params = $this->getMessageParameters();
+		$params = $this->extractParameters();
 		if ( isset( $params[4] ) && $params[4] === '1' ) {
+			// Messages: logentry-move-move-noredirect, logentry-move-move_redir-noredirect
 			$key .= '-noredirect';
 		}
 
@@ -47,10 +48,11 @@ class MoveLogFormatter extends LogFormatter {
 
 	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 );
+		unset( $params[4] ); // handled in getMessageKey
 
 		return $params;
 	}
@@ -69,18 +71,43 @@ class MoveLogFormatter extends LogFormatter {
 			return '';
 		}
 
-		$revert = Linker::linkKnown(
+		$revert = $this->getLinkRenderer()->makeKnownLink(
 			SpecialPage::getTitleFor( 'Movepage' ),
-			$this->msg( 'revertmove' )->escaped(),
-			array(),
-			array(
+			$this->msg( 'revertmove' )->text(),
+			[],
+			[
 				'wpOldTitle' => $destTitle->getPrefixedDBkey(),
 				'wpNewTitle' => $this->entry->getTarget()->getPrefixedDBkey(),
 				'wpReason' => $this->msg( 'revertmove' )->inContentLanguage()->text(),
 				'wpMovetalk' => 0
-			)
+			]
 		);
 
 		return $this->msg( 'parentheses' )->rawParams( $revert )->escaped();
 	}
+
+	protected function getParametersForApi() {
+		$entry = $this->entry;
+		$params = $entry->getParameters();
+
+		static $map = [
+			'4:title:target',
+			'5:bool:suppressredirect',
+			'4::target' => '4:title:target',
+			'5::noredir' => '5:bool:suppressredirect',
+		];
+		foreach ( $map as $index => $key ) {
+			if ( isset( $params[$index] ) ) {
+				$params[$key] = $params[$index];
+				unset( $params[$index] );
+			}
+		}
+
+		if ( !isset( $params['5:bool:suppressredirect'] ) ) {
+			$params['5:bool:suppressredirect'] = false;
+		}
+
+		return $params;
+	}
+
 }