Fix forwarding from the Mailbox list. I posted to the Devel list about this on June...

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

diff --git a/src/right_main.php b/src/right_main.php
index 00a166e1bcd5fbbf5c1c532367766349e253605d..ea29fdac35deee094823b06f9001bf57da97ada4 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -184,13 +184,8 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
         sqsession_register($aMailbox,'aLastSelectedMailbox');
         session_write_close();
         // we have to redirect to the compose page
-        global $PHP_SELF;
-        if (!strpos($PHP_SELF,'?')) {
-            $location = $PHP_SELF.'?mailbox=INBOX&startMessage=1';
-        } else {
-            $location = $PHP_SELF;
-        }
-        $location = set_url_var($location, 'session',$aMailbox['FORWARD_SESSION'], false);
+        $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+                    '&session='.$aMailbox['FORWARD_SESSION'];
         header("Location: $location");
         exit;
     }