From 86baf59b9ccd9339cce271bc909c14e3b0e881f2 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Mon, 1 Nov 2010 00:14:21 +0000 Subject: [PATCH] Avoid unnecessary linebreaks in difflines. Fixes bug 25725 --- RELEASE-NOTES | 1 + includes/diff/DifferenceEngine.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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); } } -- 2.20.1