diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-10-01 17:31:22 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-10-01 17:31:22 +0200 |
| commit | 2696cf9b9eb84e52532f783cfcab6e4264d53c76 (patch) | |
| tree | 7eaa74544a790e18144d9d06f123050775714a93 /mod/mail.php | |
| parent | e07ff7d3fbb9bef720831dc71470b70a882abfdf (diff) | |
| parent | d9f962ee6ff086da4c7b2d5959802397cb072ef2 (diff) | |
| download | volse-hubzilla-2696cf9b9eb84e52532f783cfcab6e4264d53c76.tar.gz volse-hubzilla-2696cf9b9eb84e52532f783cfcab6e4264d53c76.tar.bz2 volse-hubzilla-2696cf9b9eb84e52532f783cfcab6e4264d53c76.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/mail.php')
| -rw-r--r-- | mod/mail.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mod/mail.php b/mod/mail.php index e4a5ebafd..525127a71 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -324,6 +324,7 @@ function mail_content(&$a) { $mails[] = array( 'mailbox' => $mailbox, 'id' => $message['id'], + 'mid' => $message['mid'], 'from_name' => $message['from']['xchan_name'], 'from_url' => chanlink_hash($message['from_xchan']), 'from_photo' => $message['from']['xchan_photo_s'], @@ -333,6 +334,7 @@ function mail_content(&$a) { 'subject' => $message['title'], 'body' => smilies(bbcode($message['body']) . $s), 'delete' => t('Delete message'), + 'dreport' => t('Delivery report'), 'recall' => t('Recall message'), 'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false), 'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''), |