From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Fri, 16 Dec 2016 14:34:43 +0000 (-0500)
Subject: More properly fix error message
X-Git-Tag: 1.31.0-rc.0~4553^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=773556d635cac99edceacf8d1b1f86b830aa2c97;p=lhc%2Fweb%2Fwiklou.git

More properly fix error message

I2b686228 was a quick bandaid, but resulted in the error message not
actually reporting the incorrect list type.

Change-Id: I2b2bd6ee66a78fadb31b3524dfe04bf9e1f45535
---

diff --git a/includes/Message.php b/includes/Message.php
index 3893c9deb3..fd67613e28 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1305,9 +1305,9 @@ class Message implements MessageSpecifier, Serializable {
 	 */
 	protected function formatListParam( array $params, $listType, $format ) {
 		if ( !isset( self::$listTypeMap[$listType] ) ) {
-			$warning = 'Invalid list type for message "' . $this->getKey() . '": ' .
-				htmlspecialchars( serialize( $params )
-			);
+			$warning = 'Invalid list type for message "' . $this->getKey() . '": '
+				. htmlspecialchars( $listType )
+				. ' (params are ' . htmlspecialchars( serialize( $params ) ) . ')';
 			trigger_error( $warning, E_USER_WARNING );
 			$e = new Exception;
 			wfDebugLog( 'Bug58676', $warning . "\n" . $e->getTraceAsString() );