Check $contact['id']

- see https://github.com/friendica/friendica/issues/6918#issuecomment-498043313

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index a0bbdd10499f43abbf6138d976c7a145e6d66402..7e1d8c2ba5d9a174534df794fd619ff454dcb4d4 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2157,7 +2157,8 @@ class Contact extends BaseObject
 
                if (!empty($contact)) {
             // Contact is blocked at user-level
-                   if (self::isBlockedByUser($contact['id'], $importer['id'])) {
+                   if (!empty($contact['id']) && !empty($importer['id']) &&
+                       self::isBlockedByUser($contact['id'], $importer['id'])) {
                        return false;
             }
 

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index fe2a608ec6fd0358fd94757e08ae0f6e471dfe81..ec4557e8221a70f833b090d2da98f32f8cb78b2b 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2216,11 +2216,10 @@ class DFRN
        {
                Logger::log("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, Logger::DEBUG);
 
-               if (($entrytype == DFRN::TOP_LEVEL)) {
+               if (($entrytype == DFRN::TOP_LEVEL) && !empty($importer['id'])) {
                        // The filling of the the "contact" variable is done for legcy reasons
                        // The functions below are partly used by ostatus.php as well - where we have this variable
-                       $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($importer["id"]));
-                       $contact = $r[0];
+                       $contact = Contact::select([], ['id' => $importer['id']]);
 
                        // Big question: Do we need these functions? They were part of the "consume_feed" function.
                        // This function once was responsible for DFRN and OStatus.