Fix: When "Return To Message List After Move" is off, deleting message from message...

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

diff --git a/src/read_body.php b/src/read_body.php
index aeff2e7ee4000a95c0da41942c8a10744c64da67..041591b6791308cbbcc4f84dac0b6fd50bf967d9 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -653,6 +653,8 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message,
             $oTemplate->assign('move_delete_form_action', $base_uri.'src/read_body.php');
         $oTemplate->assign('delete_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" .
                                                 addHidden('msg[0]', $passed_id)."\n" .
+                                                // only need when $return_to_message_list_after_move is off
+                                                addHidden('passed_id', ($next >= 0 ? $next : $prev))."\n" .
                                                 addHidden('startMessage', $startMessage)."\n" );
         if (!(isset($passed_ent_id) && $passed_ent_id)) {
             $oTemplate->assign('can_be_moved', true);
@@ -940,6 +942,13 @@ if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
     handleMessageListForm($imapConnection,$aMailbox,$sButton='setDeleted', array($delete_id));
 }
 
+/**
+ * or delete button... why is handleMessageListForm (per above) conditional anway?
+ */
+if ( sqgetGlobalVar('delete', $ignore, SQ_POST) ) {
+    $sError = handleMessageListForm($imapConnection,$aMailbox);
+}
+
 /**
  * or move button... why is handleMessageListForm (per above) conditional anway?
  */