Split down patch-actor-table.sql

[lhc/web/wiklou.git] / includes / tidy / Balancer.php

diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index fa89c1a..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,
                ],
        ];
 }
@@ -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 ' .