diff options
| author | zottel <github@zottel.net> | 2015-09-18 09:38:55 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2015-09-18 09:38:55 +0200 |
| commit | 4d05d477f8363aceb08d533c79d048b4e7be1fa3 (patch) | |
| tree | 3646350c02e363b77ab63a089a6803a4bfdb67ed /mod/mail.php | |
| parent | 3017dbc8c1058c9a1258a19aff39d3833d5d038c (diff) | |
| parent | cc95c3e9c81a11d96b6670180f53490ec30e0324 (diff) | |
| download | volse-hubzilla-4d05d477f8363aceb08d533c79d048b4e7be1fa3.tar.gz volse-hubzilla-4d05d477f8363aceb08d533c79d048b4e7be1fa3.tar.bz2 volse-hubzilla-4d05d477f8363aceb08d533c79d048b4e7be1fa3.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/mail.php')
| -rw-r--r-- | mod/mail.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mod/mail.php b/mod/mail.php index 152db3231..80d7f477d 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -125,8 +125,7 @@ function mail_content(&$a) { $tpl = get_markup_template('mail_head.tpl'); $header = replace_macros($tpl, array( - '$messages' => t('Messages'), - '$tab_content' => $tab_content + '$header' => t('Messages'), )); if((argc() == 3) && (argv(1) === 'drop')) { @@ -160,8 +159,6 @@ function mail_content(&$a) { if((argc() > 1) && (argv(1) === 'new')) { - $o .= $header; - $plaintext = true; $tpl = get_markup_template('msg-header.tpl'); |