Skip to content

Commit 762a62a

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' into 'stable-3.1'
merge db_mysql.inc.php from server/ and interface/ See merge request ispconfig/ispconfig3!815
2 parents b5d4439 + 0e8a6d5 commit 762a62a

File tree

14 files changed

+448
-225
lines changed

14 files changed

+448
-225
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)