Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  typo in function name

* master:

2 files changed, 3 insertions, 4 deletions

diff --git a/boot.php b/boot.php
index b02e686ba..4a4adbbc8 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1295' );
+define ( 'FRIENDICA_VERSION',      '2.3.1296' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1133      );
 
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);
 	}
 
 	/**