bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8413 from annando/fix-warning

Browse source 
Avoid notice in gcontact.php
This commit is contained in:
Hypolite Petovan 2020-03-12 17:16:59 -04:00 committed by GitHub
commit d92b9a79e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Model/GContact.php
View file

@ -1343,14 +1343,18 @@ class GContact
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(($contact))]); $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(($contact))]);
if (DBA::isResult($gcontact)) { if (DBA::isResult($gcontact)) {
$fields = [];
if (in_array($contact, $followers)) { if (in_array($contact, $followers)) {
$fields = ['gcid' => $gcid, 'follower-gcid' => $gcontact['id']]; $fields = ['gcid' => $gcid, 'follower-gcid' => $gcontact['id']];
} elseif (in_array($contact, $followings)) { } elseif (in_array($contact, $followings)) {
$fields = ['gcid' => $gcontact['id'], 'follower-gcid' => $gcid]; $fields = ['gcid' => $gcontact['id'], 'follower-gcid' => $gcid];
} }
Logger::info('Set relation between contacts', $fields);
DBA::update('gfollower', ['deleted' => false], $fields, true); if (!empty($fields)) {
continue; Logger::info('Set relation between contacts', $fields);
DBA::update('gfollower', ['deleted' => false], $fields, true);
continue;
}
} }
if (!Network::isUrlBlocked($contact)) { if (!Network::isUrlBlocked($contact)) {