Followup to IIS installer tweaks in [9bb48c36]:

[quix0rs-gnu-social.git] / lib / statusnet.php

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 2aa73486eb100ad996cca777f497d1509cd24bda..7cb831696bc02ac512a69f6190469242227371c4 100644 (file)
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -141,7 +141,7 @@ class StatusNet
             return true;
         }
 
-        $sn = Status_network::staticGet($nickname);
+        $sn = Status_network::staticGet('nickname', $nickname);
         if (empty($sn)) {
             return false;
             throw new Exception("No such site nickname '$nickname'");
@@ -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;
+                }
             }
         }