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 c7d9a26..6671f49 100644 (file)
--- 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 c06eea0..7cf7bbe 100644 (file)
--- 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 = [