summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-10-01 17:45:52 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-10-01 17:45:52 +0200
commitc23aad2feb9923cbf9197f4d99f73978a61de832 (patch)
tree790552324ff0c554c2df2452108af244e94cd8ea /program/steps/mail
parentab08544520cc47b8a63be1737d5d6edb02c511b4 (diff)
Revert "Add full headers view in message preview window (#1488538)"
This reverts commit af276f21e5364eb65a56b64c3455bc284ff1e2f2. Conflicts: CHANGELOG skins/larry/mail.css
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc9
1 files changed, 2 insertions, 7 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 8bf80a6ee..45582d40d 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1055,17 +1055,12 @@ 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'), ''));
-
- 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']);
+ $html .= html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('show-headers','',this)"), '');
$OUTPUT->add_gui_object('all_headers_row', 'all-headers');
$OUTPUT->add_gui_object('all_headers_box', 'headers-source');
- return count($attrib) > 1 ? html::div($attrib, $html) : $html;
+ return html::div($attrib, $html);
}