From aa1340ebb1e775a36b74dbfc22391ee095d45394 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Wed, 22 Nov 2017 22:56:18 +0000 Subject: [PATCH] Make return-to-message work for forwards git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14745 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compose.php b/src/compose.php index f25ae34c..a45512aa 100644 --- a/src/compose.php +++ b/src/compose.php @@ -574,7 +574,8 @@ if ($send) { } else { if ( !isset($pageheader_sent) || !$pageheader_sent ) { global $return_to_message_after_reply; - if (($action === 'reply' || $action === 'reply_all') && $return_to_message_after_reply) + if (($action === 'reply' || $action === 'reply_all' || $action === 'forward' || $action === 'forward_as_attachment') + && $return_to_message_after_reply && $passed_id) header("Location: $location/read_body.php?passed_id=$passed_id&mailbox=$urlMailbox". "&startMessage=$startMessage&mail_sent=$mail_sent"); else -- 2.25.1