Skip to content

Commit 40437c7

Browse files
committed
Fix Mailvelope integration regression (#10152)
1 parent 446ef67 commit 40437c7

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

program/actions/mail/get.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ public function run($args = [])
3333
$rcmail = rcmail::get_instance();
3434

3535
// This resets X-Frame-Options for framed output (#6688)
36-
$rcmail->output->page_headers();
36+
// Not needed in AJAX mode (#10152)
37+
// TODO: Make this action available in non-AJAX mode only, create a separate action for
38+
// getting mail part content as-is using AJAX.
39+
if ($rcmail->output instanceof rcmail_output_html) {
40+
$rcmail->output->page_headers();
41+
}
3742

3843
// show loading page
3944
if (!empty($_GET['_preload'])) {

0 commit comments

Comments
 (0)