From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 19 Oct 2005 20:51:01 +0000 (+0000)
Subject: Fixlet for two-pass dump: strip carriage returns to normalize newlines.
X-Git-Tag: 1.6.0~1393
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=e8cdf678de9dfa862508dc5a0ec7d19a15521a7f;p=lhc%2Fweb%2Fwiklou.git

Fixlet for two-pass dump: strip carriage returns to normalize newlines.
---

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 ) {