Fix blocking of concurrent instances in PHP >7.2 (bug #703)

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index c8d986521ccc52abdf1b98b72c66b21ab70f0400..787ab79beb68a78e8b0724e20a67efa08f59c72d 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -566,8 +566,12 @@ function restart_session() {
 * @return null
 */
 function stop_session($force = false) {
-       if (!ini_bool("session.use_cookies") || ($force && @ini_set("session.use_cookies", false) !== false)) { // @ - may be disabled
+       $use_cookies = ini_bool("session.use_cookies");
+       if (!$use_cookies || $force) {
                session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
+               if ($use_cookies && @ini_set("session.use_cookies", false) === false) { // @ - may be disabled
+                       session_start();
+               }
        }
 }
 

diff --git a/changes.txt b/changes.txt
index 15d4fa4235943c043c31408ca2eea3fde821f3ef..c209b6584975463c0792c6159f907db3552a6a03 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 4.7.3-dev:
 Allow editing foreign keys pointing to tables in other database/schema (bug #694)
+Fix blocking of concurrent instances in PHP >7.2 (bug #703)
 MySQL: Speed up displaying tables in large databases (bug #700, regression from 4.7.2)
 MySQL: Allow editing rows identified by negative floats (bug #695)
 MySQL: Skip editing generated columns