diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-06-06 17:30:09 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-06-06 17:30:09 +0000 |
| commit | 3436c02c8194e8327064e22ced17ccfabad556fb (patch) | |
| tree | 3a5331513b7c4fe15bd49d33eeb6966232137a44 | |
| parent | 3998bfad458a6bfb8a659841fe5964b4aeaf030f (diff) | |
| download | brdo-3436c02c8194e8327064e22ced17ccfabad556fb.tar.gz brdo-3436c02c8194e8327064e22ced17ccfabad556fb.tar.bz2 | |
- 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.
| -rw-r--r-- | modules/user.module | 6 | ||||
| -rw-r--r-- | modules/user/user.module | 6 |
2 files changed, 6 insertions, 6 deletions
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()); } diff --git a/modules/user/user.module b/modules/user/user.module index fc5333c36..c794a8e57 100644 --- a/modules/user/user.module +++ b/modules/user/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()); } |