summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-26 12:23:41 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-26 12:23:41 +0000
commit198111882c9ba94a32a26adab5145fe71f31b0ac (patch)
tree0fd8a94d3299f5112874036a10d931fc0a1335c5
parentada4d49c30d8c31035efcf186056a773dd8f3d2b (diff)
- Fix redirect to mail/compose on re-login (1488226)
git-svn-id: https://svn.roundcube.net/trunk@6128 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/index.php4
1 files changed, 4 insertions, 0 deletions
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