Merge remote-tracking branch 'upstream/develop' into item-view

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 80eac343ed517ccf9bc597d0129978d548c190a6..f12f54015f589717c45b100aea20f8111a688317 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -332,7 +332,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 +385,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`,