wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Followup to IIS installer tweaks in [9bb48c36]:

Browse Source 
* 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
This commit is contained in:
Brion Vibber 2010-10-12 13:00:03 -07:00
parent 93172cc828
commit 9d9e80ea21
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/installer.php
View File

@ -85,7 +85,11 @@ abstract class Installer
$config = INSTALLDIR.'/config.php'; $config = INSTALLDIR.'/config.php';
if (file_exists($config)) { if (file_exists($config)) {
if (!is_writable($config) || filesize($config) > 0) { if (!is_writable($config) || filesize($config) > 0) {
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.'); $this->warning('Config file "config.php" already exists.');
}
$pass = false; $pass = false;
} }
} }

3
lib/statusnet.php
View File

@ -336,10 +336,13 @@ class StatusNet
foreach ($config_files as $_config_file) { foreach ($config_files as $_config_file) {
if (@file_exists($_config_file)) { if (@file_exists($_config_file)) {
// Ignore 0-byte config files
if (filesize($_config_file) > 0) {
include($_config_file); include($_config_file);
self::$have_config = true; self::$have_config = true;
} }
} }
}
if (!self::$have_config) { if (!self::$have_config) {
throw new NoConfigException("No configuration file found.", throw new NoConfigException("No configuration file found.",