Merge pull request #10229 from MrPetovan/bug/fatal-errors

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index f12f54015f589717c45b100aea20f8111a688317..06542bbaf24708f507448f88f817cc9c6aa4c755 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,7 +29,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
-use Friendica\Model\Notify\Type;
 use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -452,6 +451,11 @@ function render_messages(array $msg, $t)
                $body_e = $rr['body'];
                $to_name_e = $rr['name'];
 
+               if (is_null($rr['url'])) {
+                       // contact-id is pointing to a non existing contact
+                       continue;
+               }
+
                $contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar']);
                $from_photo = Contact::getThumb($contact, $rr['thumb'] ?: $rr['from-photo']);