From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 1 Nov 2017 22:34:36 +0000 (+0000)
Subject: Merge "Clean up "bad parameter" error messages in Message handler"
X-Git-Tag: 1.31.0-rc.0~1620
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=f783b2707183c64fcd2dc7e43e6c3c38c0c4f02b;hp=4c81ea9904c89653fc62a9ec83bf6d6d9e6071d2

Merge "Clean up "bad parameter" error messages in Message handler"
---

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]' ];
 			}