MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Avoid an error in OnePoll when the contact was "null".

Browse source
This commit is contained in:
Michael 2018-03-14 19:47:14 +00:00
parent 335b18769e
commit 7db0b850cb
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Worker/OnePoll.php
View file

@ -582,11 +582,15 @@ class OnePoll
logger("Consume feed of contact ".$contact['id']); logger("Consume feed of contact ".$contact['id']);
consume_feed($xml, $importer, $contact, $hub, 1, 1); // Use a copy of the contact to avoid problems.
// The contact parameter is called by reference.
$contact2 = $contact;
consume_feed($xml, $importer, $contact2, $hub, 1, 1);
// do it twice. Ensures that children of parents which may be later in the stream aren't tossed // do it twice. Ensures that children of parents which may be later in the stream aren't tossed
consume_feed($xml, $importer, $contact, $hub, 1, 2); $contact2 = $contact;
consume_feed($xml, $importer, $contact2, $hub, 1, 2);
$hubmode = 'subscribe'; $hubmode = 'subscribe';
if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) { if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) {