From 2dd06563cd6475d8549e07dcb8d31290294c669f Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 1 Nov 2017 11:29:43 -0700 Subject: [PATCH] Clean up "bad parameter" error messages in Message handler Change-Id: I64b54b1991d17ae97a8dd9414d6807daab982a3a --- includes/Message.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/includes/Message.php b/includes/Message.php index 0240fa7477..2a55d0ee74 100644 --- a/includes/Message.php +++ b/includes/Message.php @@ -1167,11 +1167,17 @@ class Message implements MessageSpecifier, Serializable { } elseif ( isset( $param['list'] ) ) { return $this->formatListParam( $param['list'], $param['type'], $format ); } else { - $warning = 'Invalid parameter for message "' . $this->getKey() . '": ' . - htmlspecialchars( serialize( $param ) ); - trigger_error( $warning, E_USER_WARNING ); - $e = new Exception; - wfDebugLog( 'Bug58676', $warning . "\n" . $e->getTraceAsString() ); + if ( !is_scalar( $param ) ) { + $param = serialize( $param ); + } + \MediaWiki\Logger\LoggerFactory::getInstance( 'Bug58676' )->warning( + 'Invalid parameter for message "{msgkey}": {param}', + [ + 'exception' => new Exception, + 'msgkey' => $this->getKey(), + 'param' => htmlspecialchars( $param ), + ] + ); return [ 'before', '[INVALID]' ]; } -- 2.20.1