From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 22 Jun 2005 21:59:56 +0000 (+0000)
Subject: * (bug 750) Keep line endings consistent in LocalSettings.php
X-Git-Tag: 1.5.0beta1~85
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=commitdiff_plain;h=9f870b8855bf06c573366b0e127495be9e6851fc;p=lhc%2Fweb%2Fwiklou.git

* (bug 750) Keep line endings consistent in LocalSettings.php
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 44e89a2aae..6072b11c49 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -323,6 +323,7 @@ Various bugfixes, small features, and a few experimental things:
   the factually inaccurate text that was there.
 * (bug 2178) Fix temp dir check again
 * (bug 2488) Format 'deletedtext' message as wikitext
+* (bug 750) Keep line endings consistent in LocalSettings.php
 
 
 === Caveats ===
diff --git a/config/index.php b/config/index.php
index 74349e4a6e..47a8fdae46 100644
--- a/config/index.php
+++ b/config/index.php
@@ -1057,7 +1057,7 @@ function writeLocalSettings( $conf ) {
 	}
 
 	$sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":";
-	return "
+	$localsettings = "
 # This file was automatically generated by the MediaWiki installer.
 # If you make manual changes, please keep track in case you need to
 # recreate them later.
@@ -1163,6 +1163,9 @@ if ( \$wgCommandLineMode ) {
 \$wgRightsIcon = \"{$slconf['RightsIcon']}\";
 # \$wgRightsCode = \"{$slconf['RightsCode']}\"; # Not yet used
 ";
+	// Keep things in Unix line endings internally;
+	// the system will write out as local text type.
+	return str_replace( "\r\n", "\n", $localsettings );
 }
 
 function dieout( $text ) {