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

Move $error to Adminer::$error

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-28 19:10:40 +01:00
parent 3cfae4b8f4
commit 65d97caeb9
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/include/bootstrap.inc.php
View File

@@ -39,7 +39,7 @@ if ($_GET["script"] == "version") {
exit; exit;
} }
global $adminer, $connection, $driver, $drivers, $error, $permanent, $has_token, $translations; // allows including Adminer inside a function global $adminer, $connection, $driver, $drivers, $permanent, $has_token, $translations; // allows including Adminer inside a function
if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"]; $_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"];

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

@@ -435,18 +435,15 @@ function redirect(?string $location, string $message = null): void {
* @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, $error, $adminer; global $connection, $adminer;
if ($execute) { if ($execute) {
$start = microtime(true); $start = microtime(true);
$failed = !$connection->query($query); $failed = !$connection->query($query);
$time = format_time($start); $time = format_time($start);
} }
$sql = ""; $sql = ($query ? $adminer->messageQuery($query, $time, $failed) : "");
if ($query) {
$sql = $adminer->messageQuery($query, $time, $failed);
}
if ($failed) { if ($failed) {
$error = error() . $sql . script("messagesPrint();"); $adminer->error .= error() . $sql . script("messagesPrint();") . "<br>";
return false; return false;
} }
if ($redirect) { if ($redirect) {