Fix login redirect issues (#1487686)

14 years ago · 88007cf060
parent 87a61d62d2
commit 88007cf060
2 changed files with 3 additions and 2 deletions
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================

+- Fix login redirect issues (#1487686)
 - Require PHP 5.2.1 or greater

 RELEASE 0.5
--- 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