Restore previous permission comment in Widget\CalendarExport

[friendica.git] / src / Worker / OnePoll.php

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 377bda85f4c4ebd94b3eea0c47f2d1329c7ffab8..c1c6fdd1a8da8b2f216044bc2b2eabdcefd60e93 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -153,6 +153,7 @@ class OnePoll
                }
 
                $importer = $r[0];
+               $url = '';
 
                logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
@@ -380,6 +381,7 @@ class OnePoll
                                                        $datarray = [];
                                                        $datarray['verb'] = ACTIVITY_POST;
                                                        $datarray['object-type'] = ACTIVITY_OBJ_NOTE;
+                                                       $datarray['network'] = NETWORK_MAIL;
                                                        // $meta = Email::messageMeta($mbox, $msg_uid);
 
                                                        $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
@@ -580,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']) {