mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-17 02:05:19 +02:00
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts: include/config.php update.php
This commit is contained in:
commit
355c42cb30
1809 changed files with 48790 additions and 7152 deletions
6
include/dba.php
Executable file → Normal file
6
include/dba.php
Executable file → Normal file
|
@ -207,8 +207,10 @@ function q($sql) {
|
|||
unset($args[0]);
|
||||
|
||||
if($db && $db->connected) {
|
||||
$ret = $db->q(vsprintf($sql,$args));
|
||||
return $ret;
|
||||
$stmt = vsprintf($sql,$args);
|
||||
if($stmt === false)
|
||||
logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
|
||||
return $db->q($stmt);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue