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

Reenabled PDO engine.

This commit is contained in:
Michael Vogel 2014-05-09 20:43:06 +02:00
parent 018b1f0086
commit dfa52185ca
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/dba.php
View File

@ -1,9 +1,10 @@
<?php <?php
// Temporarily removed
//if(class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) { # if PDO is avaible for mysql, use the new database abstraction
// require_once("library/dddbl2/dddbl.php"); if(class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
// require_once("include/dba_pdo.php"); require_once("library/dddbl2/dddbl.php");
//} require_once("include/dba_pdo.php");
}
require_once('include/datetime.php'); require_once('include/datetime.php');

14
include/dba_pdo.php
View File

@ -189,9 +189,10 @@ class dba {
if(($result === true) || ($result === false)) if(($result === true) || ($result === false))
return $result; return $result;
if ($onlyquery) { if ($onlyquery) {
$this->result = $result; $this->result = $r; # this will store an PDOStatement Object in result
$this->result->execute(); # execute the Statement, to get its result
return true; return true;
} }
@ -203,17 +204,17 @@ class dba {
} }
public function qfetch() { public function qfetch() {
if (!$this->result) if (false === $this->result)
return false; return false;
return $this->result->fetch(); return $this->result->fetch();
} }
public function qclose() { public function qclose() {
if ($this->result) if ($this->result)
$this->result->closeCursor(); return $this->result->closeCursor();
} }
public function dbg($dbg) { public function dbg($dbg) {
@ -337,4 +338,3 @@ if(! function_exists('dba_timer')) {
function dba_timer() { function dba_timer() {
return microtime(true); return microtime(true);
}} }}