From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Mon, 1 Nov 2010 00:14:21 +0000 (+0000)
Subject: Avoid unnecessary linebreaks in difflines. Fixes bug 25725
X-Git-Tag: 1.31.0-rc.0~34163
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=86baf59b9ccd9339cce271bc909c14e3b0e881f2;p=lhc%2Fweb%2Fwiklou.git

Avoid unnecessary linebreaks in difflines. Fixes bug 25725
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 82ce949694..53102a1eb3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -380,6 +380,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 25642) A exception is now thrown instead of a fatal error when using
   $wgSMTP without PEAR mail package
 * (bug 19633) When possible, Upscale small SVGs when creating thumbnails.
+* (bug 25725) Unwanted linebreaks in diffs.
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index f46705c523..c148d23853 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -1045,7 +1045,7 @@ class _HWLDF_WordAccumulator {
 
 	function getLines() {
 		$this->_flushLine('~done');
-		return $this->_lines;
+		return preg_replace( '/\n/m', '', $this->_lines);
 	}
 }