- Applied some fixes from trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/index.php b/index.php
index d87406222..8bc5c2070 100644
--- a/index.php
+++ b/index.php
@@ -119,6 +119,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