diff options
| author | git-marijus <mario@mariovavti.com> | 2017-04-26 14:19:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 14:19:54 +0200 |
| commit | c39a6800968f7ac017d215306b55d5b6bb39ded6 (patch) | |
| tree | 10db25e4ce7ca6b62eae087214e6869a17a37b2c /Zotlabs/Module | |
| parent | e8ddee284cbc82782aef0fc51a2079bf3f6a7327 (diff) | |
| parent | 7d5ee81628a08dd560f7fdaa5b4d5a3f5ce3fb95 (diff) | |
| download | volse-hubzilla-c39a6800968f7ac017d215306b55d5b6bb39ded6.tar.gz volse-hubzilla-c39a6800968f7ac017d215306b55d5b6bb39ded6.tar.bz2 volse-hubzilla-c39a6800968f7ac017d215306b55d5b6bb39ded6.zip | |
Merge pull request #733 from zotlabs/etwoeemail
Etwoeemail
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Mail.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 2fb89fed5..52f1ddf32 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -113,18 +113,18 @@ class Mail extends \Zotlabs\Web\Controller { if($preview) { $mail = [ - 'mailbox' => 'outbox', - 'id' => 0, - 'mid' => 'M0', - 'from_name' => $channel['xchan_name'], - 'from_url' => $channel['xchan_url'], - 'from_photo' => $channel['xchan_photo_s'], - 'subject' => zidify_links(smilies(bbcode($subject))), - 'body' => zidify_links(smilies(bbcode($body))), + 'mailbox' => 'outbox', + 'id' => 0, + 'mid' => 'M0', + 'from_name' => $channel['xchan_name'], + 'from_url' => $channel['xchan_url'], + 'from_photo' => $channel['xchan_photo_s'], + 'subject' => zidify_links(smilies(bbcode($subject))), + 'body' => zidify_links(smilies(bbcode($body))), 'attachments' => '', - 'can_recall' => false, + 'can_recall' => false, 'is_recalled' => '', - 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c') + 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c') ]; echo replace_macros(get_markup_template('mail_conv.tpl'), [ '$mail' => $mail ] ); |