diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-19 21:11:11 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-19 21:11:11 -0800 |
| commit | c8af19c69c03b39d5eded833a2d9d8ed9ab5826c (patch) | |
| tree | 16ded6330f1baa9d8e889978c9e093f1e90d7d85 /mod/mail.php | |
| parent | 92d0a9404ff92da23b558f9a73a3150f97b6a08e (diff) | |
| parent | 18cae8a78cb3df8ffcd9e4787c3b572c799036da (diff) | |
| download | volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.tar.gz volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.tar.bz2 volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/mail.php')
| -rw-r--r-- | mod/mail.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/mail.php b/mod/mail.php index dacb181c5..6c778b956 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -113,6 +113,7 @@ function mail_content(&$a) { } $channel = $a->get_channel(); + head_set_icon($channel['xchan_photo_s']); $cipher = get_pconfig(local_user(),'system','default_cipher'); @@ -163,13 +164,16 @@ function mail_content(&$a) { $tpl = get_markup_template('msg-header.tpl'); - $a->page['htmlhead'] .= replace_macros($tpl, array( + $header = replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(true), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$nickname' => $channel['channel_address'], '$linkurl' => t('Please enter a link URL:'), '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') )); + + $a->page['htmlhead'] .= $header; + $preselect = (isset($a->argv[2])?array($a->argv[2]):false); $prename = $preurl = $preid = ''; @@ -276,7 +280,7 @@ function mail_content(&$a) { $tpl = get_markup_template('msg-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( - '$nickname' => $channel['channel_addr'], + '$nickname' => $channel['channel_address'], '$baseurl' => $a->get_baseurl(true), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$linkurl' => t('Please enter a link URL:'), |