From: umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 6 Aug 2014 09:00:47 +0000 (+0200)
Subject: Unset redirect param in MoveLogFormatter::getMessageParameters
X-Git-Tag: 1.31.0-rc.0~13905^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=6af79836211322920bc65521bbd01163491dbde8;p=lhc%2Fweb%2Fwiklou.git

Unset redirect param in MoveLogFormatter::getMessageParameters

The redirect param is used to get a different message key, so there is
no need to pass it to the message, because the value is stable.
'logentry-move-move' always get a '0' and
'logentry-move-move-noredirect' always a '1'
The value is only visible with uselang=qqx

Change-Id: Ib6a3303e7401e29561165355b3611c3c123bfcd0
---

diff --git a/includes/logging/MoveLogFormatter.php b/includes/logging/MoveLogFormatter.php
index 3913016392..35da113ab5 100644
--- a/includes/logging/MoveLogFormatter.php
+++ b/includes/logging/MoveLogFormatter.php
@@ -37,8 +37,9 @@ class MoveLogFormatter extends LogFormatter {
 
 	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';
 		}
 
@@ -51,6 +52,7 @@ class MoveLogFormatter extends LogFormatter {
 		$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;
 	}