Skip to content

Commit 400986d

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents b361d13 + 98a32a2 commit 400986d

File tree

17 files changed

+452
-228
lines changed

17 files changed

+452
-228
lines changed

interface/lib/app.inc.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ public function __construct() {
6262
$this->_conf = $conf;
6363
if($this->_conf['start_db'] == true) {
6464
$this->load('db_'.$this->_conf['db_type']);
65-
$this->db = new db;
65+
try {
66+
$this->db = new db;
67+
} catch (Exception $e) {
68+
$this->db = false;
69+
}
6670
}
6771

6872
//* Start the session

0 commit comments

Comments
 (0)