diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-20 12:44:46 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-20 12:44:46 +0000 |
| commit | 2460a5538a39f02471653cc64f7a92704ac303c5 (patch) | |
| tree | 24ff165996d5f6a05e4d1bfa33bcf11f2cdc76b2 /roundcubemail/program | |
| parent | 8715e7dca5670530e3c1d198103abfd2bb594b1a (diff) | |
Fix empty subject header display (#1485383) + improve safari CSS hacks
git-svn-id: https://svn.roundcube.net/trunk@1862 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 567675772..928dce33e 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -774,10 +774,6 @@ function rcmail_message_headers($attrib, $headers=NULL) if (!$headers) $headers = is_object($MESSAGE->headers) ? get_object_vars($MESSAGE->headers) : $MESSAGE->headers; - // add empty subject if none exsists - if (empty($headers['subject'])) - $headers['subject'] = rcube_label('nosubject'); - $header_count = 0; // allow the following attributes to be added to the <table> tag @@ -808,6 +804,8 @@ function rcmail_message_headers($attrib, $headers=NULL) } else if (in_array($hkey, array('from', 'to', 'cc', 'bcc'))) $header_value = Q(rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']), 'show'); + else if ($hkey == 'subject' && empty($headers[$hkey])) + $header_value = Q(rcube_label('nosubject')); else $header_value = Q(trim($IMAP->decode_header($headers[$hkey]))); |