From f4698cbfa1b6c7d3c1b5b88555f85c949c3adbef Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 27 Apr 2012 07:13:19 +0000
Subject: - Applied fixes from trunk up to r6129

---
 index.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 41f62bb8a..3f4aebb94 100644
--- a/index.php
+++ b/index.php
@@ -129,6 +129,10 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
       // prevent endless looping on login page
       if ($query['_task'] == 'login')
         unset($query['_task']);
+
+      // prevent redirect to compose with specified ID (#1488226)
+      if ($query['_action'] == 'compose' && !empty($query['_id']))
+        $query = array();
     }
 
     // allow plugins to control the redirect url after login success
-- 
cgit v1.2.3