mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-08 07:36:44 +02:00
Code Issues Releases Wiki Activity

Integrate Db::result in get_val

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-28 15:11:12 +01:00
parent 195341d075
commit 7a19fa67fd
5 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
adminer/include/functions.inc.php
View File

@@ -164,11 +164,17 @@ function get_password() {
}
/** Get single value from database
* @return string or false if error
* @return string|false false if error
*/
function get_val(string $query, int $field = 0): string {
function get_val(string $query, int $field = 0, ?Db $conn = null) {
global $connection;
return $connection->result($query, $field);
$conn = $conn ?: $connection;
$result = $conn->query($query);
if (!is_object($result)) {
return false;
}
$row = $result->fetch_row();
return ($row ? $row[$field] : false);
}
/** Get list of values from database
@@ -855,7 +861,7 @@ function slow_query(string $query): array {
if (!$slow_query && support("kill")) {
$connection2 = connect($adminer->credentials());
if (is_object($connection2) && ($db == "" || $connection2->select_db($db))) {
$kill = $connection2->result(connection_id()); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
$kill = get_val(connection_id(), 0, $connection2); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
echo script("const timeout = setTimeout(() => { ajax('" . js_escape(ME) . "script=kill', function () {}, 'kill=$kill&token=$token'); }, 1000 * $timeout);");
}
}