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 801cdeb34bbda561ffada42ada4dbe63f374a364..21d1c13ee6f0eb568a7a02d13859450b8e13f217 100644 (file)
--- 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