aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-20 06:27:46 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-20 06:27:46 +0100
commit22f6687f44c4fc6bc1938ea434a5c7a665a53127 (patch)
treeff02d6830e37c1082afc8b957e0099dc56da9f19 /index.php
parent059886a1e493451dffddb0fd863cb002930eae9b (diff)
parente56633d5b0009fd5430a15fd09633e8f43bdb7dd (diff)
downloadvolse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.tar.gz
volse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.tar.bz2
volse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'index.php')
-rwxr-xr-xindex.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/index.php b/index.php
index 3758b38b0..dc6000bd6 100755
--- a/index.php
+++ b/index.php
@@ -36,6 +36,12 @@ 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.");
+ }
+
unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
/**