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
Merge "rdbms: fix finalization stage errors in LBFactory::commitMasterChanges"
[lhc/web/wiklou.git]
/
includes
/
diff
/
WordAccumulator.php
diff --git
a/includes/diff/WordAccumulator.php
b/includes/diff/WordAccumulator.php
index
a26775f
..
88631ed
100644
(file)
--- a/
includes/diff/WordAccumulator.php
+++ b/
includes/diff/WordAccumulator.php
@@
-46,11
+46,9
@@
class WordAccumulator {
private function flushGroup( $new_tag ) {
if ( $this->group !== '' ) {
if ( $this->tag == 'ins' ) {
private function flushGroup( $new_tag ) {
if ( $this->group !== '' ) {
if ( $this->tag == 'ins' ) {
- $this->line .= "<ins{$this->insClass}>" .
- htmlspecialchars( $this->group ) . '</ins>';
+ $this->line .= "<ins{$this->insClass}>" . htmlspecialchars( $this->group ) . '</ins>';
} elseif ( $this->tag == 'del' ) {
} elseif ( $this->tag == 'del' ) {
- $this->line .= "<del{$this->delClass}>" .
- htmlspecialchars( $this->group ) . '</del>';
+ $this->line .= "<del{$this->delClass}>" . htmlspecialchars( $this->group ) . '</del>';
} else {
$this->line .= htmlspecialchars( $this->group );
}
} else {
$this->line .= htmlspecialchars( $this->group );
}
@@
-91,6
+89,8
@@
class WordAccumulator {
$this->flushLine( $tag );
$word = substr( $word, 1 );
}
$this->flushLine( $tag );
$word = substr( $word, 1 );
}
+ // FIXME: Don't use assert()
+ // phpcs:ignore MediaWiki.Usage.ForbiddenFunctions.assert
assert( !strstr( $word, "\n" ) );
$this->group .= $word;
}
assert( !strstr( $word, "\n" ) );
$this->group .= $word;
}