Merge pull request #4060 from annando/system-unavailable
"system_unavailable.php" is unavailable now
This commit is contained in:
commit
369fcb7bae
4 changed files with 15 additions and 23 deletions
10
boot.php
10
boot.php
|
@ -563,16 +563,6 @@ function x($s, $k = null)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Called from db initialisation if db is dead.
|
||||
*/
|
||||
function system_unavailable()
|
||||
{
|
||||
include 'system_unavailable.php';
|
||||
system_down();
|
||||
killme();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Returns the baseurl.
|
||||
*
|
||||
|
|
|
@ -97,7 +97,7 @@ class dba {
|
|||
if (!self::$connected) {
|
||||
self::$db = null;
|
||||
if (!$install) {
|
||||
system_unavailable();
|
||||
System::unavailable();
|
||||
}
|
||||
}
|
||||
$a->save_timestamp($stamp1, "network");
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
<?php
|
||||
|
||||
function system_down() {
|
||||
echo <<< EOT
|
||||
<html>
|
||||
<head><title>System Unavailable</title></head>
|
||||
<body>
|
||||
Apologies but this site is unavailable at the moment. Please try again later.
|
||||
</body>
|
||||
</html>
|
||||
EOT;
|
||||
}
|
|
@ -100,6 +100,20 @@ class System
|
|||
return implode(', ', $callstack2);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Called from db initialisation when db is dead.
|
||||
*/
|
||||
static public function unavailable() {
|
||||
echo <<< EOT
|
||||
<html>
|
||||
<head><title>System Unavailable</title></head>
|
||||
<body>Apologies but this site is unavailable at the moment. Please try again later.</body>
|
||||
</html>
|
||||
EOT;
|
||||
|
||||
killme();
|
||||
}
|
||||
|
||||
/// @todo Move the following functions from boot.php
|
||||
/*
|
||||
function get_guid($size = 16, $prefix = "")
|
||||
|
|
Loading…
Reference in a new issue