aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Lib/Config.php2
-rw-r--r--boot.php4
-rw-r--r--include/system_unavailable.php7
3 files changed, 7 insertions, 6 deletions
diff --git a/Zotlabs/Lib/Config.php b/Zotlabs/Lib/Config.php
index 5e735be34..933f4bff3 100644
--- a/Zotlabs/Lib/Config.php
+++ b/Zotlabs/Lib/Config.php
@@ -51,8 +51,6 @@ class Config {
}
App::$config[$family]['config_loaded'] = true;
}
-
-
}
}
diff --git a/boot.php b/boot.php
index db4e0ea87..e2e224548 100644
--- a/boot.php
+++ b/boot.php
@@ -681,8 +681,8 @@ function sys_boot() {
* Load configs from db. Overwrite configs from .htconfig.php
*/
- load_config('system');
- load_config('feature');
+ Config::Load('system');
+ Config::Load('feature');
App::$session = new Zotlabs\Web\Session();
App::$session->init();
diff --git a/include/system_unavailable.php b/include/system_unavailable.php
index 4e0e6717b..e927bc633 100644
--- a/include/system_unavailable.php
+++ b/include/system_unavailable.php
@@ -3,7 +3,10 @@
require_once("include/network.php");
function system_down() {
-http_status(503, 'Service Unavailable');
+// Set $skiplog to true here. Otherwise we will run into a loop
+// when system_unavailable() -> system_down() is called from Zotlabs\Lib\Config::Load()
+// but the DB is not available.
+http_status(503, 'Service Unavailable', true);
echo <<< EOT
<html>
<head><title>System Unavailable</title></head>
@@ -12,4 +15,4 @@ Apologies but this site is unavailable at the moment. Please try again later.
</body>
</html>
EOT;
-} \ No newline at end of file
+}