From 773556d635cac99edceacf8d1b1f86b830aa2c97 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Fri, 16 Dec 2016 09:34:43 -0500 Subject: [PATCH] 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 --- includes/Message.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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() ); -- 2.20.1