aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-29 20:16:49 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-29 20:16:49 -0400
commitfe1e384a51e753baf2d80aaf35af7d0a3b4dfbeb (patch)
tree328215df9dbfe0b0fe8468331d5c0cf4eb0c7d21 /include
parente7b920c273efd8c6a70b90f701bd14f5c632d38f (diff)
parent5921dc6f1679afdcc0551da248f94d24db9ed360 (diff)
downloadvolse-hubzilla-fe1e384a51e753baf2d80aaf35af7d0a3b4dfbeb.tar.gz
volse-hubzilla-fe1e384a51e753baf2d80aaf35af7d0a3b4dfbeb.tar.bz2
volse-hubzilla-fe1e384a51e753baf2d80aaf35af7d0a3b4dfbeb.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: typo in function name * master:
Diffstat (limited to 'include')
-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);
}
/**