aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-20 00:20:26 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-20 00:20:26 -0800
commit7b459ec3558107a2f8ae685cd4ce847f74f821e6 (patch)
treea7325356b3f6d558f0e54b1de8e7e396697b6148 /index.php
parent301072a86cacd2620a08cf07f2cef55dffac3c2f (diff)
parente56633d5b0009fd5430a15fd09633e8f43bdb7dd (diff)
downloadvolse-hubzilla-7b459ec3558107a2f8ae685cd4ce847f74f821e6.tar.gz
volse-hubzilla-7b459ec3558107a2f8ae685cd4ce847f74f821e6.tar.bz2
volse-hubzilla-7b459ec3558107a2f8ae685cd4ce847f74f821e6.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
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);
/**