diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 06:27:46 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 06:27:46 +0100 |
commit | 22f6687f44c4fc6bc1938ea434a5c7a665a53127 (patch) | |
tree | ff02d6830e37c1082afc8b957e0099dc56da9f19 /index.php | |
parent | 059886a1e493451dffddb0fd863cb002930eae9b (diff) | |
parent | e56633d5b0009fd5430a15fd09633e8f43bdb7dd (diff) | |
download | volse-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-x | index.php | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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); /** |