From dfa52185cac97b86225f20b2e73839de03a54e22 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 9 May 2014 20:43:06 +0200
Subject: [PATCH] Reenabled PDO engine.

---
 include/dba.php     | 11 ++++++-----
 include/dba_pdo.php | 14 +++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/include/dba.php b/include/dba.php
index 760bac10ce..7409ec3a8c 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,9 +1,10 @@
 <?php
-// Temporarily removed
-//if(class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
-//  require_once("library/dddbl2/dddbl.php");
-//  require_once("include/dba_pdo.php");
-//}
+
+# if PDO is avaible for mysql, use the new database abstraction
+if(class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
+  require_once("library/dddbl2/dddbl.php");
+  require_once("include/dba_pdo.php");
+}
 
 require_once('include/datetime.php');
 
diff --git a/include/dba_pdo.php b/include/dba_pdo.php
index 76937e7f95..2f1309b9a2 100644
--- a/include/dba_pdo.php
+++ b/include/dba_pdo.php
@@ -189,9 +189,10 @@ class dba {
 
 		if(($result === true) || ($result === false))
 			return $result;
-
+    
 		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;
 		}
     
@@ -203,17 +204,17 @@ class dba {
 	}
 
 	public function qfetch() {
-  
-		if (!$this->result)
+
+		if (false === $this->result)
       return false;
-      
+
     return $this->result->fetch();
 
 	}
   
 	public function qclose() {
 		if ($this->result)
-      $this->result->closeCursor();
+      return $this->result->closeCursor();
 	}
 
 	public function dbg($dbg) {
@@ -337,4 +338,3 @@ if(! function_exists('dba_timer')) {
 function dba_timer() {
   return microtime(true);
 }}
-
-- 
2.39.5