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
This commit is contained in:
jakubvrana 2009-12-08 22:57:39 +00:00
parent fc3b652a8b
commit 483d7dc0ba

View file

@ -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