Merge branch '0.9.x' into 1.0.x

2010-10-12 16:33:36 -07:00
parent aa02f6020e 112b6c4079
commit 5f81f6119b
269 changed files with 7703 additions and 3045 deletions
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -341,8 +341,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;
+                }
            }
        }