diff options
| author | Evan Prodromou <evan@status.net> | 2010-05-21 16:47:57 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-05-21 16:47:57 -0400 |
| commit | 6d8e01ad13dd9bc9e149f43a1eb88671d4737f4d (patch) | |
| tree | 12f8b318971d1a1eebbb318e3c19142a56dce444 /lib/installer.php | |
| parent | 8a2144aeed2e338ef1b21425b9387086790aa820 (diff) | |
| parent | bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline
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); |