Commit 3436c02c authored by Dries's avatar Dries
Browse files

- 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.
parent 3998bfad
...@@ -320,7 +320,7 @@ function user_block($op = "list", $delta = 0) { ...@@ -320,7 +320,7 @@ function user_block($op = "list", $delta = 0) {
*/ */
if (empty($edit)) { 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. // 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 = "") { ...@@ -634,7 +634,7 @@ function user_login($edit = array(), $msg = "") {
*/ */
if (empty($edit)) { if (empty($edit)) {
$edit["destination"] = request_uri(); $edit["destination"] = url($_GET["q"]);
} }
$output .= form_hidden("destination", $edit["destination"]); $output .= form_hidden("destination", $edit["destination"]);
...@@ -685,7 +685,7 @@ function user_logout() { ...@@ -685,7 +685,7 @@ function user_logout() {
** Redirect the user to his personal information page: ** Redirect the user to his personal information page:
*/ */
drupal_goto("index.php"); drupal_goto(url());
} }
......
...@@ -320,7 +320,7 @@ function user_block($op = "list", $delta = 0) { ...@@ -320,7 +320,7 @@ function user_block($op = "list", $delta = 0) {
*/ */
if (empty($edit)) { 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. // 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 = "") { ...@@ -634,7 +634,7 @@ function user_login($edit = array(), $msg = "") {
*/ */
if (empty($edit)) { if (empty($edit)) {
$edit["destination"] = request_uri(); $edit["destination"] = url($_GET["q"]);
} }
$output .= form_hidden("destination", $edit["destination"]); $output .= form_hidden("destination", $edit["destination"]);
...@@ -685,7 +685,7 @@ function user_logout() { ...@@ -685,7 +685,7 @@ function user_logout() {
** Redirect the user to his personal information page: ** Redirect the user to his personal information page:
*/ */
drupal_goto("index.php"); drupal_goto(url());
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment