- Fixed small glitch in drupal_goto(): somethimes a "&" got appended.  Patch
  by Marco.

includes/common.inc

@@ -314,19 +314,19 @@ 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)) {
+  else {
+    $sid = session_name() . "=" . session_id();
+
+    if (strstr($url, "?") && !strstr($url, $sid)) {
       header("Location: $url&". $sid);
     }
     else {
       header("Location: $url?". $sid);
     }
+  }
 
   /*
   ** The "Location" header sends a REDIRECT status code to the http