diff options
| author | petko <petko@524c5546-5005-0410-9a3e-e25e191bd360> | 2010-05-10 15:03:34 +0000 |
|---|---|---|
| committer | petko <petko@524c5546-5005-0410-9a3e-e25e191bd360> | 2010-05-10 15:03:34 +0000 |
| commit | bfce3794068dcb1c8ee9d2056ba678be3ee043e5 (patch) | |
| tree | cc2af4f63573f07303b59eb8bea3c5caf63b7190 /scripts/pagerev.php | |
| parent | 97e53326dd024b7ad6a58f94c44b4ac58a2cf523 (diff) | |
| download | pmwiki.svn-bfce3794068dcb1c8ee9d2056ba678be3ee043e5.tar.bz2 | |
collapse adjacent inline insertions and deletions in DiffRenderSource (PITS:01192)
git-svn-id: svn://pmwiki.org/pmwiki/trunk@2556 524c5546-5005-0410-9a3e-e25e191bd360
Diffstat (limited to 'scripts/pagerev.php')
| -rw-r--r-- | scripts/pagerev.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/pagerev.php b/scripts/pagerev.php index c39ab5d6..317a54ce 100644 --- a/scripts/pagerev.php +++ b/scripts/pagerev.php @@ -198,6 +198,7 @@ function DiffRenderSource($in, $out, $which) { $z2[0] = $line.$z2[0]; foreach ($cnt as $a) $lines[] = implode('', array_slice($z2, $a[0], $a[1])); $ret = trim(implode("\n", $lines)); + $ret = preg_replace('!</(del|ins)> <\1>!', ' ', $ret); return str_replace("\n","<br />",$ret); } ## Split a line into pieces before passing it through `diff` |