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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 44e89a2..6072b11 100644 (file)
--- 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 74349e4..47a8fda 100644 (file)
--- 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 ) {