diff options
| author | Paweł Słowik <pawel.slowik@iq.pl> | 2012-09-13 14:24:01 +0200 |
|---|---|---|
| committer | Paweł Słowik <pawel.slowik@iq.pl> | 2012-09-13 14:24:01 +0200 |
| commit | 2cdaa79dce689b2dc9ef5c7bf3dcbd9446d86c21 (patch) | |
| tree | 7482d3bd9a71a9913f4e28392b09e11c519987de /program/steps/mail/func.inc | |
| parent | 92a030d928246cfc5f3c0b1f2538dc1bfb4777e3 (diff) | |
| parent | d7439260770eb1f70cdc5abf5df13e6c62ff3991 (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 45582d40d..8bf80a6ee 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1055,12 +1055,17 @@ function rcmail_message_full_headers($attrib, $headers=NULL) global $OUTPUT; $html = html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), '')); - $html .= html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('show-headers','',this)"), ''); + + if (!get_boolean($attrib['no-switch'])) { + $html .= html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('show-headers','',this)"), ''); + } + + unset($attrib['no-switch']); $OUTPUT->add_gui_object('all_headers_row', 'all-headers'); $OUTPUT->add_gui_object('all_headers_box', 'headers-source'); - return html::div($attrib, $html); + return count($attrib) > 1 ? html::div($attrib, $html) : $html; } |