Merge pull request #3830 from annando/dba-pdo-connected

DBA: The "connected" check for PDO didn't work.
This commit is contained in:
Tobias Diekershoff 2017-10-29 08:11:27 +01:00 committed by GitHub
commit 404ed27fb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -222,10 +222,15 @@ class dba {
} }
public static function connected() { public static function connected() {
$connected = false;
switch (self::$driver) { switch (self::$driver) {
case 'pdo': case 'pdo':
// Not sure if this really is working like expected $r = dba::p("SELECT 1");
$connected = (self::$db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != ""); if (dbm::is_result($r)) {
$row = dba::inArray($r);
$connected = ($row[0]['1'] == '1');
}
break; break;
case 'mysqli': case 'mysqli':
$connected = self::$db->ping(); $connected = self::$db->ping();