From 198111882c9ba94a32a26adab5145fe71f31b0ac Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 26 Apr 2012 12:23:41 +0000
Subject: - Fix redirect to mail/compose on re-login (1488226)

git-svn-id: https://svn.roundcube.net/trunk@6128 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roundcubemail/index.php b/roundcubemail/index.php
index 6790338fc..945915086 100644
--- a/roundcubemail/index.php
+++ b/roundcubemail/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