strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3617 from ddorian1/develop

Browse source 
Catch exceptions in PDO constructor
This commit is contained in:
Michael Vogel 2017-08-05 15:42:29 +02:00 committed by GitHub
parent 93fb98959a 37262c24d9
commit 56de36574b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/dba.php
View file

@ -75,9 +75,11 @@ class dba {
if (isset($a->config["system"]["db_charset"])) { if (isset($a->config["system"]["db_charset"])) {
$connect .= ";charset=".$a->config["system"]["db_charset"]; $connect .= ";charset=".$a->config["system"]["db_charset"];
} }
$this->db = @new PDO($connect, $user, $pass); try {
if (!$this->db->errorCode()) { $this->db = @new PDO($connect, $user, $pass);
$this->connected = true; $this->connected = true;
} catch (PDOException $e) {
$this->connected = false;
} }
} elseif (class_exists('mysqli')) { } elseif (class_exists('mysqli')) {
$this->driver = 'mysqli'; $this->driver = 'mysqli';