Browse Source

Make return-to-message work for forwards

pdontthink 7 years ago
parent
commit
7645faa520
1 changed files with 2 additions and 1 deletions
  1. 2 1
      src/compose.php

+ 2 - 1
src/compose.php

@@ -574,7 +574,8 @@ if ($send) {
         } else {
         } else {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 global $return_to_message_after_reply;
                 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".
                     header("Location: $location/read_body.php?passed_id=$passed_id&mailbox=$urlMailbox".
                             "&startMessage=$startMessage&mail_sent=$mail_sent");
                             "&startMessage=$startMessage&mail_sent=$mail_sent");
                 else
                 else