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

Use driver() instead of $driver

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-29 21:00:44 +01:00
parent 845445baad
commit 168ea5ae6d
22 changed files with 83 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,7 @@ function adminer() {
/** Get Driver object */
function driver(): Driver {
global $driver;
return $driver;
return Driver::$instance;
}
/** Unescape database identifier
@@ -601,7 +600,6 @@ function column_foreign_keys(string $table): array {
* @return Field[] same as fields()
*/
function fields_from_edit(): array { // used by Mongo and SimpleDB
global $driver;
$return = array();
foreach ((array) $_POST["field_keys"] as $key => $val) {
if ($val != "") {
@@ -616,7 +614,7 @@ function fields_from_edit(): array { // used by Mongo and SimpleDB
"field" => $name,
"privileges" => array("insert" => 1, "update" => 1, "where" => 1, "order" => 1),
"null" => 1,
"auto_increment" => ($key == $driver->primary),
"auto_increment" => ($key == driver()->primary),
);
}
return $return;
@@ -830,10 +828,9 @@ function count_rows(string $table, array $where, bool $is_group, array $group):
* @return string[]
*/
function slow_query(string $query): array {
global $driver;
$db = adminer()->database();
$timeout = adminer()->queryTimeout();
$slow_query = $driver->slowQuery($query, $timeout);
$slow_query = driver()->slowQuery($query, $timeout);
$connection2 = null;
if (!$slow_query && support("kill")) {
$connection2 = connect(adminer()->credentials());