aboutsummaryrefslogtreecommitdiffstats
path: root/include/dba.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-30 09:03:43 +0200
committerzottel <github@zottel.net>2012-03-30 09:03:43 +0200
commit2212e6931096d188be2dea27bcb4877f16c5c2f8 (patch)
treea0a6b3cec6b1b4108c62ff689e8842d49226b982 /include/dba.php
parent953840cf822718cba66a0727b576c674c6e44875 (diff)
parentd22b3a1d9c295f5545cc20e1af786cb79e6553a5 (diff)
downloadvolse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.tar.gz
volse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.tar.bz2
volse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/dba.php')
-rwxr-xr-xinclude/dba.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/dba.php b/include/dba.php
index 138e82b58..76cc0bc7b 100755
--- a/include/dba.php
+++ b/include/dba.php
@@ -209,9 +209,8 @@ function q($sql) {
if($db && $db->connected) {
$stmt = vsprintf($sql,$args);
if($stmt === false)
- logger('dba: vsprintf error: ' . print_r(debug_bracktrace(),true));
- $ret = $db->q($stmt);
- return $ret;
+ logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+ return $db->q($stmt);
}
/**