From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 6 Dec 2007 21:35:01 +0000 (+0000)
Subject: * (bug 12148) Text highlight wasn't applied to cleanly deleted and added
X-Git-Tag: 1.31.0-rc.0~50516
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=0a04fb1ed525e8a9764fe2bebcc031a3b7ff9eda;p=lhc%2Fweb%2Fwiklou.git

* (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 fd92d07bdd..f29aaed8cc 100644
--- 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 3c3d2ba197..349c88ec58 100644
--- 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";
 		}
 	}