From 6c862208d82eb0cbbd4fa5355c612ff647978474 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 29 Nov 2002 05:45:57 +0000
Subject: [PATCH] - Fixed small glitch in drupal_goto(): somethimes a "&" got
appended. Patch by Marco.
---
includes/common.inc | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/includes/common.inc b/includes/common.inc
index f4104aaed6dd..7e5715dee112 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);
+ }
}
/*
--
GitLab