Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: typo in function name * master:
This commit is contained in:
commit
fe1e384a51
2
boot.php
2
boot.php
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '2.3.1295' );
|
define ( 'FRIENDICA_VERSION', '2.3.1296' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1133 );
|
define ( 'DB_UPDATE_VERSION', 1133 );
|
||||||
|
|
||||||
|
|
|
@ -209,9 +209,8 @@ function q($sql) {
|
||||||
if($db && $db->connected) {
|
if($db && $db->connected) {
|
||||||
$stmt = vsprintf($sql,$args);
|
$stmt = vsprintf($sql,$args);
|
||||||
if($stmt === false)
|
if($stmt === false)
|
||||||
logger('dba: vsprintf error: ' . print_r(debug_bracktrace(),true));
|
logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
|
||||||
$ret = $db->q($stmt);
|
return $db->q($stmt);
|
||||||
return $ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue