From 9d9e80ea2135c09d911bb60ce01852d77fbb3365 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 12 Oct 2010 13:00:03 -0700
Subject: 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

---
 lib/installer.php | 6 +++++-
 lib/statusnet.php | 7 +++++--
 2 files changed, 10 insertions(+), 3 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;
             }
         }
diff --git a/lib/statusnet.php b/lib/statusnet.php
index 7212a4a47..7cb831696 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -336,8 +336,11 @@ class StatusNet
 
         foreach ($config_files as $_config_file) {
             if (@file_exists($_config_file)) {
-                include($_config_file);
-                self::$have_config = true;
+                // Ignore 0-byte config files
+                if (filesize($_config_file) > 0) {
+                    include($_config_file);
+                    self::$have_config = true;
+                }
             }
         }
 
-- 
cgit v1.2.3-54-g00ecf