Avoid unnecessary linebreaks in difflines. Fixes bug 25725

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 82ce949..53102a1 100644 (file)
--- 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 f46705c..c148d23 100644 (file)
--- 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);
        }
 }