X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fparser%2FParserOutput.php;h=d2ef5e303918e1593f577c3d52d1cee50ff47ccc;hp=9dfa97cb5a8f10bc12bc36f1fca14a0caf059261;hb=0e15a6068a5a07fc109b5898ae51fdb8decafaf0;hpb=fb2523edf2f52601ca998ab002ce8b7c5d848c08

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 9dfa97cb5a..d2ef5e3039 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -188,7 +188,9 @@ class ParserOutput extends CacheTime {
 	 */
 	private $mExtensionData = [];
 
-	/** @var array $mLimitReportData Parser limit report data. */
+	/**
+	 * @var array $mLimitReportData Parser limit report data.
+	 */
 	private $mLimitReportData = [];
 
 	/**
@@ -991,34 +993,24 @@ class ParserOutput extends CacheTime {
 	/**
 	 * Sets parser limit report data for a key
 	 *
-	 * If $value consist of a list of two floats, it will be interpreted as
-	 * (actual value, maximum allowed value). The presence of a "-" in $key will cause
-	 * the first part of the key to be interpreted as a namespace.
+	 * The key is used as the prefix for various messages used for formatting:
+	 *  - $key: The label for the field in the limit report
+	 *  - $key-value-text: Message used to format the value in the "NewPP limit
+	 *      report" HTML comment. If missing, uses $key-format.
+	 *  - $key-value-html: Message used to format the value in the preview
+	 *      limit report table. If missing, uses $key-format.
+	 *  - $key-value: Message used to format the value. If missing, uses "$1".
+	 *
+	 * Note that all values are interpreted as wikitext, and so should be
+	 * encoded with htmlspecialchars() as necessary, but should avoid complex
+	 * HTML for sanity of display in the "NewPP limit report" comment.
 	 *
 	 * @since 1.22
-	 * @param string $key Data key
-	 * @param mixed $value Data value One of (float, string, bool, JSON serializable array)
+	 * @param string $key Message key
+	 * @param mixed $value Appropriate for Message::params()
 	 */
 	public function setLimitReportData( $key, $value ) {
-		if ( is_array( $value ) ) {
-			if ( array_keys( $value ) === [ 0, 1 ]
-				&& is_numeric( $value[0] )
-				&& is_numeric( $value[1] )
-			) {
-				$data = [ 'value' => $value[0], 'limit' => $value[1] ];
-			} else {
-				$data = $value;
-			}
-		} else {
-			$data = $value;
-		}
-
-		if ( strpos( $key, '-' ) ) {
-			list( $ns, $name ) = explode( '-', $key, 2 );
-			$this->mLimitReportData[$ns][$name] = $data;
-		} else {
-			$this->mLimitReportData[$key] = $data;
-		}
+		$this->mLimitReportData[$key] = $value;
 	}
 
 	/**