| Index: trunk/phase3/HISTORY |
| — | — | @@ -406,7 +406,6 @@ |
| 407 | 407 | * (bug 25642) A exception is now thrown instead of a fatal error when using |
| 408 | 408 | $wgSMTP without PEAR mail package |
| 409 | 409 | * (bug 19633) When possible, Upscale small SVGs when creating thumbnails. |
| 410 | | -* (bug 25725) Unwanted linebreaks in diffs. |
| 411 | 410 | * (bug 11013) Database driver detection needs rewriting for robustness |
| 412 | 411 | * (bug 13409) Installer prompts could use clarification--now has help boxes |
| 413 | 412 | * (bug 16902) Installer spews warnings when exec() and dl() are not available |
| Index: trunk/phase3/includes/diff/WikiDiff.php |
| — | — | @@ -1045,7 +1045,7 @@ |
| 1046 | 1046 | |
| 1047 | 1047 | function getLines() { |
| 1048 | 1048 | $this->_flushLine( '~done' ); |
| 1049 | | - return str_replace( '\n', '', $this->_lines ); |
| | 1049 | + return $this->_lines; |
| 1050 | 1050 | } |
| 1051 | 1051 | } |
| 1052 | 1052 | |