X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Ftidy%2FBalancer.php;h=6671f49ba7d065eeffa493776d7b78aac8c5a22c;hb=d8ce984944939c2fd17f4676fc6f6ccf1a1222e2;hp=fa89c1a5e167dcc9ca1ec463d771ba4b757b8a20;hpb=95cf21f8ee45faaa6c933b42bebae687a28849c4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index fa89c1a5e1..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,
 		],
 	];
 }
@@ -1366,7 +1369,7 @@ class BalanceStack implements IteratorAggregate {
 		foreach ( $this->elements as $elt ) {
 			array_push( $r, $elt->localName );
 		}
-		return implode( $r, ' ' );
+		return implode( ' ', $r );
 	}
 }
 
@@ -1904,7 +1907,7 @@ class Balancer {
 				}
 			);
 			if ( count( $bad ) > 0 ) {
-				$badstr = implode( array_keys( $bad ), ',' );
+				$badstr = implode( ',', array_keys( $bad ) );
 				throw new ParameterAssertionException(
 					'$config',
 					'Balance attempted with sanitization including ' .