From ca7e267eb188b29c0488b931bc4c28856707aa0a Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Thu, 20 Jan 2011 09:37:41 +0000 Subject: [PATCH] Revert r75769, r80475: mistaken attempt to fix bug 25725 by deleting random newlines from the output of a different diff engine. --- HISTORY | 1 - includes/diff/WikiDiff.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 774fb91d5e..8c2dc7c603 100644 --- a/HISTORY +++ b/HISTORY @@ -406,7 +406,6 @@ LocalSettings.php. The specific bugs are listed below in the general notes. * (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. * (bug 11013) Database driver detection needs rewriting for robustness * (bug 13409) Installer prompts could use clarification--now has help boxes * (bug 16902) Installer spews warnings when exec() and dl() are not available diff --git a/includes/diff/WikiDiff.php b/includes/diff/WikiDiff.php index 83ec324cb7..6777115b32 100644 --- a/includes/diff/WikiDiff.php +++ b/includes/diff/WikiDiff.php @@ -1045,7 +1045,7 @@ class _HWLDF_WordAccumulator { function getLines() { $this->_flushLine( '~done' ); - return str_replace( '\n', '', $this->_lines ); + return $this->_lines; } } -- 2.20.1