From 45392bef3382cd0bad30ebcd343d1cdd21e16f08 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 11 May 2010 12:16:13 -0700 Subject: [PATCH] Installer tweak for Windows: normalize line endings to platform standard in generated config.php Added a comment that the writable directory checks are insufficient to catch ACL problems on Windows; need a better check for that. --- lib/installer.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/installer.php b/lib/installer.php index 589a19a66e..58ffbfef7e 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -128,6 +128,7 @@ abstract class Installer $pass = false; } + // @fixme this check seems to be insufficient with Windows ACLs if (!is_writable(INSTALLDIR)) { $this->warning(sprintf('Cannot write config file to: %s

', INSTALLDIR), sprintf('On your server, try this command: chmod a+w %s', INSTALLDIR)); @@ -409,6 +410,10 @@ abstract class Installer "\$config['db']['database'] = '{$this->db['database']}';\n\n". ($this->db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":''). "\$config['db']['type'] = '{$this->db['type']}';\n\n"; + + // Normalize line endings for Windows servers + $cfg = str_replace("\n", PHP_EOL, $cfg); + // write configuration file out to install directory $res = file_put_contents(INSTALLDIR.'/config.php', $cfg); -- 2.39.5