TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

Browse Source
This commit is contained in:
Mario
2024-01-01 20:04:44 +00:00
parent 2590e3c99b f2f9cfaf28
commit ceb510bbf5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/Config.php
View File

@@ -51,8 +51,6 @@ class Config {
}
App::$config[$family]['config_loaded'] = true;
}
}
}

4
boot.php
View File

@@ -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();

7
include/system_unavailable.php
View File

@@ -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;
}
}