summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-01-14 17:03:33 +0000
committerthomascube <thomas@roundcube.net>2011-01-14 17:03:33 +0000
commit88007cf0602434d73a21b475a151b80a9002e6da (patch)
treed5a32cbdf5def94728b1206a17716be2622437db
parent87a61d62d2d482f7a798ccc30bbac3bb2c2b22c9 (diff)
Fix login redirect issues (#1487686)
-rw-r--r--CHANGELOG1
-rw-r--r--index.php4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ce93d4c0d..b7de8145a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix login redirect issues (#1487686)
- Require PHP 5.2.1 or greater
RELEASE 0.5
diff --git a/index.php b/index.php
index 5ee2ef777..e142505d1 100644
--- a/index.php
+++ b/index.php
@@ -104,12 +104,12 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
rcmail_log_login();
// restore original request parameters
- $query = array('_task' => 'mail');
+ $query = array();
if ($url = get_input_value('_url', RCUBE_INPUT_POST))
parse_str($url, $query);
// allow plugins to control the redirect url after login success
- $redir = $RCMAIL->plugins->exec_hook('login_after', $query);
+ $redir = $RCMAIL->plugins->exec_hook('login_after', array('_task' => 'mail') + $query);
unset($redir['abort']);
// send redirect