diff --git a/include/items.php b/include/items.php index 31c8aaa799..b46e0d6a62 100644 --- a/include/items.php +++ b/include/items.php @@ -228,7 +228,7 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { * * @TODO find proper type-hints */ -function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) { +function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0) { if ($contact['network'] === NETWORK_OSTATUS) { if ($pass < 2) { // Test - remove before flight diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index 42b0d9f8c4..c1c6fdd1a8 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -582,11 +582,12 @@ class OnePoll logger("Consume feed of contact ".$contact['id']); - consume_feed($xml, $importer, $contact, $hub, 1, 1); + consume_feed($xml, $importer, $contact, $hub); - // 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); + // do it a second time for DFRN so that any children find their parents. + if ($contact['network'] === NETWORK_DFRN) { + consume_feed($xml, $importer, $contact, $hub); + } $hubmode = 'subscribe'; if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) {