strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8189 from MrPetovan/bug/fatal-errors

Browse source 
Fix wrong use of DPA::p return value in Module\NoScrape
This commit is contained in:
Philipp 2020-01-28 08:02:46 +01:00 committed by GitHub
parent 0b8fd92e1e 65cb77b6a0
commit 4231ccaa32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Module/NoScrape.php
View file

@ -69,11 +69,20 @@ class NoScrape extends BaseModule
$json_info['language'] = $a->profile['language'];
if (!($a->profile['hide-friends'] ?? false)) {
/// @todo What should this value tell us?
$result = DBA::p("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = ? LIMIT 1", intval($a->profile['uid']));
if (DBA::isResult($result)) {
$json_info["updated"] = date("c", strtotime($result[0]['updated']));
$stmt = DBA::p(
"SELECT `gcontact`.`updated`
FROM `contact`
INNER JOIN `gcontact`
WHERE `gcontact`.`nurl` = `contact`.`nurl`
AND `self`
AND `uid` = ?
LIMIT 1",
intval($a->profile['uid'])
);
if ($gcontact = DBA::fetch($stmt)) {
$json_info["updated"] = date("c", strtotime($gcontact['updated']));
}
DBA::close($stmt);
$json_info['contacts'] = DBA::count('contact',
[