diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-18 18:51:39 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-18 18:51:39 +0200 |
| commit | ce28760c2a7319f3cdc25c39a62582b722e91006 (patch) | |
| tree | 802f64d3988fc14a277c79ee5192693a4202b502 /mod/mail.php | |
| parent | 438cb1d7e0f1518dd35a3a377dfd9a9fd885f80c (diff) | |
| parent | 87c8cf489210136958d2e0b44e4c3ca48c1ff8af (diff) | |
| download | volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.tar.gz volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.tar.bz2 volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.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'); |