diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-12 13:00:03 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-12 13:00:03 -0700 |
commit | 9d9e80ea2135c09d911bb60ce01852d77fbb3365 (patch) | |
tree | ae05036bd7802774c10efb2df7c38e70bc99dc6a /lib/installer.php | |
parent | 93172cc828039f6a37a4f221050f2c2403533bc5 (diff) |
Followup to IIS installer tweaks in [9bb48c36]:
* skip 0-byte config files when initializing, go ahead and redirect to installer if no non-0-byte files
* tweak warning on installer.php to let you know if you have a 0-byte config.php that's not writable, as opposed to generally already having a config.php with data in it
Diffstat (limited to 'lib/installer.php')
-rw-r--r-- | lib/installer.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/installer.php b/lib/installer.php index 2eff2d85a..c046eadea 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -85,7 +85,11 @@ abstract class Installer $config = INSTALLDIR.'/config.php'; if (file_exists($config)) { if (!is_writable($config) || filesize($config) > 0) { - $this->warning('Config file "config.php" already exists.'); + if (filesize($config) == 0) { + $this->warning('Config file "config.php" already exists and is empty, but is not writable.'); + } else { + $this->warning('Config file "config.php" already exists.'); + } $pass = false; } } |