Browse Source

After sending the message, check $mailbox. If it's "All Folders", we got to compose via the search results page. Set $mailbox back to INBOX, which seems a sane default to me.

Closes #662346.
tassium 22 years ago
parent
commit
dc062351a0
1 changed files with 4 additions and 1 deletions
  1. 4 1
      src/compose.php

+ 4 - 1
src/compose.php

@@ -219,7 +219,6 @@ if (sqsession_is_registered('session_expired_post')) {
     if (!isset($mailbox)) {
     if (!isset($mailbox)) {
         $mailbox = '';
         $mailbox = '';
     }
     }
-
     if ($compose_new_win == '1') {
     if ($compose_new_win == '1') {
         compose_Header($color, $mailbox);
         compose_Header($color, $mailbox);
     } else {
     } else {
@@ -298,6 +297,10 @@ if ($send) {
         $AttachFailure = saveAttachedFiles($session);
         $AttachFailure = saveAttachedFiles($session);
     }
     }
     if (checkInput(false) && !isset($AttachFailure)) {
     if (checkInput(false) && !isset($AttachFailure)) {
+		if ($mailbox == "All Folders") {
+			/* We entered compose via the search results page */
+			$mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */
+		}
         $urlMailbox = urlencode (trim($mailbox));
         $urlMailbox = urlencode (trim($mailbox));
         if (! isset($passed_id)) {
         if (! isset($passed_id)) {
             $passed_id = 0;
             $passed_id = 0;