summaryrefslogtreecommitdiff
path: root/lib/installer.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-10-13 15:18:32 -0400
committerEvan Prodromou <evan@status.net>2010-10-13 15:18:32 -0400
commitddb60a8191de23fc11f6711954575ac7b6f49998 (patch)
tree46532e67a29fdd46a1877a80c253445c09e98a67 /lib/installer.php
parentf11c1c77cab7d7310ec0d2c17bc6f35c491f2871 (diff)
parent6c77d86b7f39c35eac0fcc3f13c0beba3e694318 (diff)
Merge remote branch 'gitorious/0.9.x' into 0.9.x
Diffstat (limited to 'lib/installer.php')
-rw-r--r--lib/installer.php6
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;
}
}