From 88007cf0602434d73a21b475a151b80a9002e6da Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 14 Jan 2011 12:03:33 -0500
Subject: [PATCH] Fix login redirect issues (#1487686)

---
 CHANGELOG |    1 +
 index.php |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ce93d4c..b7de814 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 5ee2ef7..e142505 100644
--- a/index.php
+++ b/index.php
@@ -104,12 +104,12 @@
     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

--
Gitblit v1.9.1