Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/installer.php b/lib/installer.php
index 1cad2fd20..56b9b6f4a 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -82,9 +82,12 @@ abstract class Installer
     {
         $pass = true;
 
-        if (file_exists(INSTALLDIR.'/config.php')) {
-            $this->warning('Config file "config.php" already exists.');
-            $pass = false;
+        $config = INSTALLDIR.'/config.php';
+        if (file_exists($config)) {
+            if (!is_writable($config) || filesize($config) > 0) {
+                $this->warning('Config file "config.php" already exists.');
+                $pass = false;
+            }
         }
 
         if (version_compare(PHP_VERSION, '5.2.3', '<')) {