From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Sat, 28 Jul 2007 21:14:48 +0000 (+0000)
Subject: Unconditionally remove session_name() in remove_from_uri()
X-Git-Tag: v3.0.0~1225
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=6272cae91208f4ec7e41250397807b43d59cbc1b;p=adminer.git

Unconditionally remove session_name() in remove_from_uri()

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

diff --git a/functions.inc.php b/functions.inc.php
index 8485d057..28d867df 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -194,9 +194,7 @@ function redirect($location, $message = null) {
 }
 
 function remove_from_uri($param = "") {
-	if (!isset($_COOKIE[session_name()])) {
-		$param = "($param|" . session_name() . ")";
-	}
+	$param = "($param|" . session_name() . ")";
 	return preg_replace("~\\?$param=[^&]*&~", '?', preg_replace("~\\?$param=[^&]*\$|&$param=[^&]*~", '', $_SERVER["REQUEST_URI"]));
 }