Revert r75769, r80475: mistaken attempt to fix bug 25725 by deleting random newlines...

diff --git a/HISTORY b/HISTORY
index 774fb91..8c2dc7c 100644 (file)
--- 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 83ec324..6777115 100644 (file)
--- 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;
        }
 }