From: Jakub Vrana <jakub@vrana.cz>
Date: Wed, 29 Dec 2010 17:15:42 +0000 (+0100)
Subject: Fix sid function
X-Git-Tag: v3.2.0~82
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=876af58944b3cf09e08976bb426236a2dd7ae53b;p=adminer.git

Fix sid function
---

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 8de6481b..41e597dd 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -165,7 +165,11 @@ function ini_bool($ini) {
 * @return bool
 */
 function sid() {
-	return (SID && !($_COOKIE && ini_bool("session.use_cookies"))); // $_COOKIE - don't pass SID with permanent login
+	static $return;
+	if (!isset($return)) { // restart_session() defines SID
+		$return = (SID && !($_COOKIE && ini_bool("session.use_cookies"))); // $_COOKIE - don't pass SID with permanent login
+	}
+	return $return;
 }
 
 /** Shortcut for $connection->quote($string)