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 8485d057dcf30138b8f74feebc1ad60b6735f29f..28d867dfff1a0dc855ac5b8aa69dd1651f0d4977 100644 (file)
--- 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"]));
 }