2 files changed, 23 insertions, 12 deletions
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index d362f58b2..4079bcaba 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -344,11 +344,8 @@ function q($sql) {
 	if(\DBA::$dba && \DBA::$dba->connected) {
 		$stmt = vsprintf($sql, $args);
 		if($stmt === false) {
-			if(version_compare(PHP_VERSION, '5.4.0') >= 0)
-				db_logger('dba: vsprintf error: ' .
-					print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1), true),LOGGER_NORMAL,LOG_CRIT);
-			else
-				db_logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true),LOGGER_NORMAL,LOG_CRIT);
+			db_logger('dba: vsprintf error: ' .
+				print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1), true),LOGGER_NORMAL,LOG_CRIT);
 		}
 		if(\DBA::$dba->debug)
 			db_logger('Sql: ' . $stmt, LOGGER_DEBUG, LOG_INFO);
@@ -445,6 +442,20 @@ function db_getfunc($f) {
 	return $f;
 }
 
+function db_load_file($f) {
+	// db errors should get logged to the logfile
+	$str = @file_get_contents($f);
+	$arr = explode(';', $str);
+	if($arr) {
+		foreach($arr as $a) {
+			if(strlen(trim($a))) {
+				$r = dbq(trim($a));
+			}
+		}
+	}
+}
+
+
 // The logger function may make DB calls internally to query the system logging parameters.
 // This can cause a recursion if database debugging is enabled.
 // So this function preserves the current database debugging state and then turns it off
diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index f76e6cdd7..f119d8926 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -74,19 +74,19 @@ class dba_pdo extends dba_driver {
 			return $result;
 		}
 
-		if($this->debug) {
-			db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($result) . ' results.', LOGGER_NORMAL, LOG_INFO); 
-		}
-
 		$r = array();
 		if($result) {
 			foreach($result as $x) {
 				$r[] = $x;
 			}
-			if($this->debug) {
-				db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO);
-			}
 		}
+
+		if($this->debug) {
+			db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($r) . ' results.', LOGGER_NORMAL, LOG_INFO); 
+			db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO);
+		}
+
+
 		return (($this->error) ? false : $r);
 	}