From: Jakub Vrana <jakub@vrana.cz>
Date: Wed, 26 Mar 2025 16:04:30 +0000 (+0100)
Subject: Separate queries(null)
X-Git-Tag: v5.1.1~144
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=d77ed188428cf57b80fe07130fa13730cad0da36;p=adminer.git

Separate queries(null)
---

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 002e113f..013b7b30 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -542,22 +542,21 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 	return true;
 }
 
+class Queries {
+	static $queries = array();
+	static $start;
+}
+
 /** Execute and remember query
-* @param string or null to return remembered queries, end with ';' to use DELIMITER
-* @return Result or [$queries, $time] if $query = null
+* @param string end with ';' to use DELIMITER
+* @return Result
 */
 function queries($query) {
 	global $connection;
-	static $queries = array();
-	static $start;
-	if (!$start) {
-		$start = microtime(true);
-	}
-	if ($query === null) {
-		// return executed queries
-		return array(implode("\n", $queries), format_time($start));
+	if (!Queries::$start) {
+		Queries::$start = microtime(true);
 	}
-	$queries[] = (preg_match('~;$~', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query) . ";";
+	Queries::$queries[] = (preg_match('~;$~', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query) . ";";
 	return $connection->query($query);
 }
 
@@ -583,7 +582,8 @@ function apply_queries($query, $tables, $escape = 'Adminer\table') {
 * @return bool
 */
 function queries_redirect($location, $message, $redirect) {
-	list($queries, $time) = queries(null);
+	$queries = implode("\n", Queries::$queries);
+	$time = format_time(Queries::$start);
 	return query_redirect($queries, $location, $message, $redirect, false, !$redirect, $time);
 }