summaryrefslogtreecommitdiff
path: root/inc/DifferenceEngine.php
diff options
context:
space:
mode:
authorAdrian Lang <dokuwiki@adrianlang.de>2011-02-06 16:49:20 +0100
committerAdrian Lang <dokuwiki@adrianlang.de>2011-02-06 16:49:52 +0100
commit4f2305cb147b801ff6ef57ed417a366a83e2d92e (patch)
tree9bd5b75139bec729edc7cbb66bbc4e05e7c69c77 /inc/DifferenceEngine.php
parentb842a02804e6c492963978620e61739485b7287f (diff)
downloadrpg-4f2305cb147b801ff6ef57ed417a366a83e2d92e.tar.gz
rpg-4f2305cb147b801ff6ef57ed417a366a83e2d92e.tar.bz2
Fix whitespace handling in inline diff (closes FS#2161)
Diffstat (limited to 'inc/DifferenceEngine.php')
-rw-r--r--inc/DifferenceEngine.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php
index 36322d222..906a17b2d 100644
--- a/inc/DifferenceEngine.php
+++ b/inc/DifferenceEngine.php
@@ -943,7 +943,7 @@ class InlineWordLevelDiff extends MappedDiff {
$orig = new _HWLDF_WordAccumulator;
foreach ($this->edits as $edit) {
if ($edit->type == 'copy')
- $orig->addWords($edit->orig);
+ $orig->addWords($edit->closing);
elseif ($edit->type == 'change'){
$orig->addWords($edit->orig, 'del');
$orig->addWords($edit->closing, 'add');