From e8cdf678de9dfa862508dc5a0ec7d19a15521a7f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 19 Oct 2005 20:51:01 +0000 Subject: [PATCH] Fixlet for two-pass dump: strip carriage returns to normalize newlines. --- maintenance/dumpTextPass.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index 235196b43e..6b3b2ab0b8 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -118,7 +118,10 @@ class TextPassDumper extends BackupDumper { array( 'old_text', 'old_flags' ), array( 'old_id' => $id ), 'TextPassDumper::getText' ); - return UtfNormal::cleanUp( strval( Revision::getRevisionText( $row ) ) ); + $text = Revision::getRevisionText( $row ); + $stripped = str_replace( "\r", "", $text ); + $normalized = UtfNormal::cleanUp( $stripped ); + return $normalized; } function startElement( $parser, $name, $attribs ) { -- 2.20.1