* (bug 12148) Text highlight wasn't applied to cleanly deleted and added

  lines in diff output

Note this still has to be replicated in wikidiff2

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fd92d07..f29aaed 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -223,7 +223,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   scripts, making for cleaner reporting during batch jobs. PHP errors will also
   be redirected in most cases on PHP 5.2.4 and later, switching 'display_errors'
   to 'stderr' at runtime.
-
+* (bug 12148) Text highlight wasn't applied to cleanly deleted and added
+  lines in diff output
 
 == Parser changes in 1.12 ==
 

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 3c3d2ba..349c88e 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -1970,13 +1970,15 @@ class TableDiffFormatter extends DiffFormatter
        function _added( $lines ) {
                foreach ($lines as $line) {
                        echo '<tr>' . $this->emptyLine() .
-                               $this->addedLine( htmlspecialchars ( $line ) ) . "</tr>\n";
+                               $this->addedLine( '<ins class="diffchange">' .
+                                       htmlspecialchars ( $line ) . '</ins>' ) . "</tr>\n";
                }
        }
 
        function _deleted($lines) {
                foreach ($lines as $line) {
-                       echo '<tr>' . $this->deletedLine( htmlspecialchars ( $line ) ) .
+                       echo '<tr>' . $this->deletedLine( '<del class="diffchange">' .
+                               htmlspecialchars ( $line ) . '</del>' ) .
                          $this->emptyLine() . "</tr>\n";
                }
        }