From: jervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 23 Aug 2004 00:59:14 +0000 (+0000)
Subject: Making delete button, when viewing a message, consider which page was viewed before
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=7fcab811a919289459e616f0e47388c1cb27195a

Making delete button, when viewing a message, consider which page was viewed before


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7946 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/ChangeLog b/ChangeLog
index 4d8f6f87..d280214f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,8 @@ Version 1.5.1 -- CVS
   - Added status bar to compose window when "Compose In New Window" is used.
   - Reenabled the move_messages_button_action hook and changed its name to
     mailbox_display_button_action to promote the new location
+  - Making delete button, when viewing a message, consider which page was viewed
+    before.
 
 Version 1.5.0
 --------------------
diff --git a/src/read_body.php b/src/read_body.php
index faed6afa..18d823ee 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -649,6 +649,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
         if (!(isset($passed_ent_id) && $passed_ent_id)) {
             $menu_row .= addHidden('mailbox', $aMailbox['NAME']);
             $menu_row .= addHidden('msg[0]', $passed_id);
+            $menu_row .= addHidden('startMessage', $startMessage);
             $menu_row .= getButton('submit', 'delete', _("Delete"));
             $menu_row .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
         } else {