From 3436c02c8194e8327064e22ced17ccfabad556fb Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 6 Jun 2003 17:30:09 +0000 Subject: - Bugfix: fixed the login problem due to incorrect use of drupal_goto(). Gerhard's patch was not 100% correct and I found a better alternative. --- modules/user.module | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/user.module') diff --git a/modules/user.module b/modules/user.module index fc5333c36..c794a8e57 100644 --- a/modules/user.module +++ b/modules/user.module @@ -320,7 +320,7 @@ function user_block($op = "list", $delta = 0) { */ if (empty($edit)) { - $edit["destination"] = request_uri(); + $edit["destination"] = url($_GET["q"]); } // NOTE: special care needs to be taken because on pages with forms, such as node and comment submission pages, the $edit variable might already be set. @@ -634,7 +634,7 @@ function user_login($edit = array(), $msg = "") { */ if (empty($edit)) { - $edit["destination"] = request_uri(); + $edit["destination"] = url($_GET["q"]); } $output .= form_hidden("destination", $edit["destination"]); @@ -685,7 +685,7 @@ function user_logout() { ** Redirect the user to his personal information page: */ - drupal_goto("index.php"); + drupal_goto(url()); } -- cgit v1.2.3