From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 28 May 2005 08:35:50 +0000 (+0000)
Subject: fixed horrible sidebar breakage under windows due to \\r\\n line endings in Language.php
X-Git-Tag: 1.5.0alpha2~65
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=ef38058ef51ca7874d8946489d5175f90fc10c25;p=lhc%2Fweb%2Fwiklou.git

fixed horrible sidebar breakage under windows due to \\r\\n line endings in Language.php
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index f0f58f9a4d..04738d6696 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -421,6 +421,10 @@ function wfMsgReal( $key, $args, $useDB, $forContent=false ) {
 			$message = $wgParser->transformMsg($message, $wgMsgParserOptions);
 		}
 	}
+	
+	# Fix windows line-endings
+	# Some messages are split with explode("\n", $msg)
+	$message = str_replace( "\r", '', $message );
 
 	# Replace arguments
 	if( count( $args ) ) {