aboutsummaryrefslogtreecommitdiffstats
path: root/mod/mail.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-12-03 18:14:52 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-12-03 18:14:52 +0100
commitc363fc71eb054ffa615bdfe03c645a9ab946379e (patch)
tree564dbaa2dac8bb13260704730a8e5483084baa67 /mod/mail.php
parentb96f09bb3aeee403038755ab5f6e6b53654cb145 (diff)
parent9f3ea71d5d9e1e42d1d1e44a8070d90814962ad2 (diff)
downloadvolse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.tar.gz
volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.tar.bz2
volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/mail.php')
-rw-r--r--mod/mail.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/mail.php b/mod/mail.php
index 536149a28..44c4b479d 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -329,7 +329,8 @@ function mail_content(&$a) {
'to_url' => chanlink_hash($message['to_xchan']),
'to_photo' => $message['to']['xchan_photo_s'],
'subject' => $message['title'],
- 'body' => smilies(bbcode($message['body']) . $s),
+ 'body' => smilies(bbcode($message['body'])),
+ 'attachments' => $s,
'delete' => t('Delete message'),
'dreport' => t('Delivery report'),
'recall' => t('Recall message'),