Merge remote-tracking branch 'upstream/2019.12-rc' into poco-cleanup

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

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 25402e3c3158d2890833656a71ca2efe16236171..f2ba89adf7bc99bfde1a93d0f89b2880072804b6 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -41,7 +41,7 @@ class OnePoll
                }
 
                if ($force) {
-                       Contact::updateFromProbe($contact_id, true);
+                       Contact::updateFromProbe($contact_id, '', true);
                }
 
                $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
@@ -562,7 +562,7 @@ class OnePoll
                                        }
 
                                        // Decoding the header
-                                       $subject = imap_mime_header_decode($meta->subject);
+                                       $subject = imap_mime_header_decode($meta->subject ?? '');
                                        $datarray['title'] = "";
                                        foreach ($subject as $subpart) {
                                                if ($subpart->charset != "default") {