friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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
parent bf29d81984 1cbe27de12
commit 404ed27fb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/dba.php
View File

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