From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Tue, 8 Dec 2009 22:57:39 +0000 (+0000)
Subject: Remove session_name() only without SID (bug #2910681)
X-Git-Tag: v3.0.0~284
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=483d7dc0ba9444105adaba6e21da4d96544ea981;p=adminer.git

Remove session_name() only without SID (bug #2910681)

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1261 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 801cdeb3..21d1c13e 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -284,8 +284,7 @@ function queries_redirect($location, $message, $redirect) {
 * @return string
 */
 function remove_from_uri($param = "") {
-	$param = "($param|" . session_name() . ")";
-	return substr(preg_replace("~(?<=[?&])$param=[^&]*&~", '', "$_SERVER[REQUEST_URI]&"), 0, -1);
+	return substr(preg_replace("~(?<=[?&])($param" . (SID ? "" : "|" . session_name()) . ")=[^&]*&~", '', "$_SERVER[REQUEST_URI]&"), 0, -1);
 }
 
 /** Generate page number for pagination