From bd5cbab59f2e24da61d2894a4a990c4b17a92605 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Fri, 14 Jan 2011 17:03:33 +0000
Subject: Fix login redirect issues (#1487686)

git-svn-id: https://svn.roundcube.net/trunk@4418 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/CHANGELOG | 1 +
 roundcubemail/index.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index ce93d4c0d..b7de8145a 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/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/roundcubemail/index.php b/roundcubemail/index.php
index 5ee2ef777..e142505d1 100644
--- a/roundcubemail/index.php
+++ b/roundcubemail/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
-- 
cgit v1.2.3