Merge pull request #9995 from annando/issue-9948

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 80eac343ed517ccf9bc597d0129978d548c190a6..22283d8e886733c40c80ebb5bf6193768a74850b 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -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;
@@ -332,7 +331,7 @@ function message_content(App $a)
                                'id' => $message['id'],
                                'from_name' => $from_name_e,
                                'from_url' => $from_url,
-                               'from_addr' => $contact['addr'],
+                               'from_addr' => $contact['addr'] ?? $from_url,
                                'sparkle' => $sparkle,
                                'from_photo' => $from_photo,
                                'subject' => $subject_e,
@@ -385,7 +384,7 @@ function message_content(App $a)
  * @param int $limit
  * @return array
  */
-function get_messages($uid, $start, $limit)
+function get_messages(int $uid, int $start, int $limit)
 {
        return DBA::toArray(DBA::p('SELECT
                        m.`id`,