From: Arlo Breault <abreault@wikimedia.org>
Date: Thu, 5 Apr 2018 00:20:38 +0000 (-0400)
Subject: Munge inline elements found in tidy.conf as well
X-Git-Tag: 1.31.0-rc.0~119^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=25a08cc5f92dd0cb757b3991990b600fe48d625d;p=lhc%2Fweb%2Fwiklou.git

Munge inline elements found in tidy.conf as well

Bug: T184900
Bug: T184228
Change-Id: I421c4c7cf1eeeb6c44bb64081b49ae05937d1a8b
---

diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index c7d9a265aa..6671f49ba7 100644
--- a/includes/tidy/Balancer.php
+++ b/includes/tidy/Balancer.php
@@ -294,6 +294,9 @@ class BalanceSets {
 			'span' => true, 'strike' => true, 'strong' => true, 'sub' => true,
 			'sup' => true, 'textarea' => true, 'tt' => true, 'u' => true,
 			'var' => true,
+			// Those defined in tidy.conf
+			'video' => true, 'audio' => true, 'bdi' => true, 'data' => true,
+			'time' => true, 'mark' => true,
 		],
 	];
 }
diff --git a/includes/tidy/RemexCompatMunger.php b/includes/tidy/RemexCompatMunger.php
index c06eea01b1..7cf7bbede6 100644
--- a/includes/tidy/RemexCompatMunger.php
+++ b/includes/tidy/RemexCompatMunger.php
@@ -61,6 +61,13 @@ class RemexCompatMunger implements TreeHandler {
 		"tt" => true,
 		"u" => true,
 		"var" => true,
+		// Those defined in tidy.conf
+		"video" => true,
+		"audio" => true,
+		"bdi" => true,
+		"data" => true,
+		"time" => true,
+		"mark" => true,
 	];
 
 	private static $formattingElements = [