dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e570633
..
6671f49
100644
(file)
--- a/
includes/tidy/Balancer.php
+++ b/
includes/tidy/Balancer.php
@@
-23,14
+23,15
@@
* @since 1.27
* @author C. Scott Ananian, 2016
*/
* @since 1.27
* @author C. Scott Ananian, 2016
*/
+
namespace MediaWiki\Tidy;
namespace MediaWiki\Tidy;
+use ExplodeIterator;
+use IteratorAggregate;
+use ReverseArrayIterator;
+use Sanitizer;
use Wikimedia\Assert\Assert;
use Wikimedia\Assert\ParameterAssertionException;
use Wikimedia\Assert\Assert;
use Wikimedia\Assert\ParameterAssertionException;
-use \ExplodeIterator;
-use \IteratorAggregate;
-use \ReverseArrayIterator;
-use \Sanitizer;
// A note for future librarization[1] -- this file is a good candidate
// for splitting into an independent library, except that it is currently
// A note for future librarization[1] -- this file is a good candidate
// for splitting into an independent library, except that it is currently
@@
-293,6
+294,9
@@
class BalanceSets {
'span' => true, 'strike' => true, 'strong' => true, 'sub' => true,
'sup' => true, 'textarea' => true, 'tt' => true, 'u' => true,
'var' => true,
'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,
],
];
}
],
];
}
@@
-1365,7
+1369,7
@@
class BalanceStack implements IteratorAggregate {
foreach ( $this->elements as $elt ) {
array_push( $r, $elt->localName );
}
foreach ( $this->elements as $elt ) {
array_push( $r, $elt->localName );
}
- return implode(
$r, ' '
);
+ return implode(
' ', $r
);
}
}
}
}
@@
-1903,7
+1907,7
@@
class Balancer {
}
);
if ( count( $bad ) > 0 ) {
}
);
if ( count( $bad ) > 0 ) {
- $badstr = implode(
array_keys( $bad ), ','
);
+ $badstr = implode(
',', array_keys( $bad )
);
throw new ParameterAssertionException(
'$config',
'Balance attempted with sanitization including ' .
throw new ParameterAssertionException(
'$config',
'Balance attempted with sanitization including ' .