Merge remote-tracking branch 'upstream/master'

1 files changed, 2 insertions, 4 deletions

diff --git a/index.php b/index.php
index dc6000bd6..6ed7eeb11 100755
--- a/index.php
+++ b/index.php
@@ -36,10 +36,8 @@ require_once('include/dba/dba_driver.php');
 
 if(! $a->install) {
 	$db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, $a->install);
-	if(! $db->connected){
-		header('HTTP/1.0 520 Unknown Error');
-		// TODO: much friendlier error message
-		die("Database error, contact admin.");
+	if(! $db->connected) {
+		system_unavailable();
 	}
 
 	unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);