diff options
| author | Dries Buytaert <dries@buytaert.net> | 2002-11-29 05:45:57 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2002-11-29 05:45:57 +0000 |
| commit | 6c862208d82eb0cbbd4fa5355c612ff647978474 (patch) | |
| tree | 435cdb2530307c39afc31ae1c0c7acd2fafefd89 /includes/common.inc | |
| parent | e2869ecafe0d42d4450dbf0ec6b4c590badc8cf3 (diff) | |
| download | brdo-6c862208d82eb0cbbd4fa5355c612ff647978474.tar.gz brdo-6c862208d82eb0cbbd4fa5355c612ff647978474.tar.bz2 | |
- Fixed small glitch in drupal_goto(): somethimes a "&" got appended. Patch
by Marco.
Diffstat (limited to 'includes/common.inc')
| -rw-r--r-- | includes/common.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/includes/common.inc b/includes/common.inc index f4104aaed..7e5715dee 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -314,18 +314,18 @@ function drupal_goto($url) { ** is compiled with "--enable-trans-sid". */ - if (ini_get("session.use_trans_sid")) { - $sid = session_name() . "=" . session_id(); - } - - if (!session_id() || strstr($url, $sid)) { + if (!ini_get("session.use_trans_sid") || !session_id() || strstr($url, $sid)) { header("Location: $url"); } - else if (strstr($url, "?") && !strstr($url, $sid)) { - header("Location: $url&". $sid); - } else { - header("Location: $url?". $sid); + $sid = session_name() . "=" . session_id(); + + if (strstr($url, "?") && !strstr($url, $sid)) { + header("Location: $url&". $sid); + } + else { + header("Location: $url?". $sid); + } } /* |