Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3420 from annando/issue-3419

Browse source 
PR 3419: Avoid problems with PHP7 and dba.php
This commit is contained in:
Tobias Diekershoff 2017-05-02 13:17:53 +02:00 committed by GitHub
commit 6882b5cda9
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/dba.php
View file

@ -577,7 +577,7 @@ class dba {
} }
if (self::$dbo->errorno != 0) { if (self::$dbo->errorno != 0) {
logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error); logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n".self::replace_parameters($sql, $args));
} }
$a->save_timestamp($stamp1, 'database'); $a->save_timestamp($stamp1, 'database');
@ -814,6 +814,9 @@ class dba {
$field = array_keys(self::$relation[$table])[0]; $field = array_keys(self::$relation[$table])[0];
$rel_def = array_values(self::$relation[$table])[0]; $rel_def = array_values(self::$relation[$table])[0];
// Create a key for preventing double queries
$qkey = $field.'-'.$table.':'.implode(':', array_keys($param)).':'.implode(':', $param);
// When the search field is the relation field, we don't need to fetch the rows // When the search field is the relation field, we don't need to fetch the rows
// This is useful when the leading record is already deleted in the frontend but the rest is done in the backend // This is useful when the leading record is already deleted in the frontend but the rest is done in the backend
if ((count($param) == 1) AND ($field == array_keys($param)[0])) { if ((count($param) == 1) AND ($field == array_keys($param)[0])) {
@ -823,14 +826,8 @@ class dba {
$commands = array_merge($commands, $retval); $commands = array_merge($commands, $retval);
} }
} }
} else {
// Create a key for preventing double queries
$qkey = $field.'-'.$table.':'.implode(':', array_keys($param)).':'.implode(':', $param);
// We quit when this key already exists in the callstack. // We quit when this key already exists in the callstack.
if (isset($callstack[$qkey])) { } elseif (!isset($callstack[$qkey])) {
continue;
}
$callstack[$qkey] = true; $callstack[$qkey] = true;