diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-02 16:23:28 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-02 16:23:28 -0800 |
| commit | 8dd4270a6aae1203bf99585a126b881a78002304 (patch) | |
| tree | 07e0c9d56ff7f29c30b53d6af155eb140a250201 /mod | |
| parent | c29f622b90a58a783787b27736cd9738e6be50c2 (diff) | |
| parent | bc0e41592648156f319503c5d4257385a42610b8 (diff) | |
| download | volse-hubzilla-8dd4270a6aae1203bf99585a126b881a78002304.tar.gz volse-hubzilla-8dd4270a6aae1203bf99585a126b881a78002304.tar.bz2 volse-hubzilla-8dd4270a6aae1203bf99585a126b881a78002304.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/mail.php | 3 |
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'), |