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/statusnet.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/statusnet.php')
| -rw-r--r-- | lib/statusnet.php | 7 |
1 files changed, 5 insertions, 2 deletions
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; + } } } |