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

Fix types

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-28 19:12:31 +01:00
parent 65d97caeb9
commit 75c94cec6b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ function get_password() {
*/ */
function get_val(string $query, int $field = 0, ?Db $conn = null) { function get_val(string $query, int $field = 0, ?Db $conn = null) {
global $connection; global $connection;
$conn = $conn ?: $connection; $conn = (is_object($conn) ? $conn : $connection);
$result = $conn->query($query); $result = $conn->query($query);
if (!is_object($result)) { if (!is_object($result)) {
return false; return false;
@@ -434,7 +434,7 @@ function redirect(?string $location, string $message = null): void {
/** Execute query and redirect if successful /** Execute query and redirect if successful
* @param bool $redirect * @param bool $redirect
*/ */
function query_redirect(string $query, string $location, string $message, $redirect = true, bool $execute = true, bool $failed = false, string $time = ""): bool { function query_redirect(string $query, ?string $location, string $message, $redirect = true, bool $execute = true, bool $failed = false, string $time = ""): bool {
global $connection, $adminer; global $connection, $adminer;
if ($execute) { if ($execute) {
$start = microtime(true); $start = microtime(true);
@@ -486,7 +486,7 @@ function apply_queries(string $query, array $tables, $escape = 'Adminer\table'):
/** Redirect by remembered queries /** Redirect by remembered queries
* @param bool $redirect * @param bool $redirect
*/ */
function queries_redirect(string $location, string $message, $redirect): bool { function queries_redirect(?string $location, string $message, $redirect): bool {
$queries = implode("\n", Queries::$queries); $queries = implode("\n", Queries::$queries);
$time = format_time(Queries::$start); $time = format_time(Queries::$start);
return query_redirect($queries, $location, $message, $redirect, false, !$redirect, $time); return query_redirect($queries, $location, $message, $redirect, false, !$redirect, $time);