Commit 6c862208 authored by Dries's avatar Dries

- Fixed small glitch in drupal_goto(): somethimes a "&" got appended.  Patch
  by Marco.
parent e2869eca
...@@ -314,19 +314,19 @@ function drupal_goto($url) { ...@@ -314,19 +314,19 @@ function drupal_goto($url) {
** is compiled with "--enable-trans-sid". ** is compiled with "--enable-trans-sid".
*/ */
if (ini_get("session.use_trans_sid")) { if (!ini_get("session.use_trans_sid") || !session_id() || strstr($url, $sid)) {
$sid = session_name() . "=" . session_id();
}
if (!session_id() || strstr($url, $sid)) {
header("Location: $url"); header("Location: $url");
} }
else if (strstr($url, "?") && !strstr($url, $sid)) { else {
$sid = session_name() . "=" . session_id();
if (strstr($url, "?") && !strstr($url, $sid)) {
header("Location: $url&". $sid); header("Location: $url&". $sid);
} }
else { else {
header("Location: $url?". $sid); header("Location: $url?". $sid);
} }
}
/* /*
** The "Location" header sends a REDIRECT status code to the http ** The "Location" header sends a REDIRECT status code to the http
......
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