diff options
author | mrjive <mrjive@mrjive.it> | 2015-10-02 09:45:03 +0200 |
---|---|---|
committer | mrjive <mrjive@mrjive.it> | 2015-10-02 09:45:03 +0200 |
commit | 32522b61f235266384c81c0669fceaf58afeb4fe (patch) | |
tree | 48427e8f48421b3bb8f344d85f2ebfe1271ea34e /mod/mail.php | |
parent | 11c1573b55f278a664a90a2872d06a40b3ac3026 (diff) | |
parent | 1da3828a09485a9b2bc6113cbab9ca9ca483ffc0 (diff) | |
download | volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.tar.gz volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.tar.bz2 volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.zip |
Merge pull request #6 from redmatrix/master
updating from original codebase
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.') : ''), |