diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-14 12:14:02 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-14 12:14:02 -0700 |
| commit | 065ecc5573607d21ae005ff2649d04558256fc7e (patch) | |
| tree | d014c007ed0adb4845fab21d7394f87f7949422c /lib/installer.php | |
| parent | 2f8480a779f3495eb64d6c9a94d6153225783e4d (diff) | |
| parent | 2e808fdc82adc862be12118332d27a36a19123ca (diff) | |
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'lib/installer.php')
| -rw-r--r-- | lib/installer.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/installer.php b/lib/installer.php index 589a19a66..58ffbfef7 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: <code>%s</code></p>', INSTALLDIR), sprintf('On your server, try this command: <code>chmod a+w %s</code>', 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); |