Remove global variable

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index c9b44ae1d13db8ae62e136c7f81ce3541c458535..d400f26f1d4d2574eb7dac174bdc5e2b683cc774 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -1024,7 +1024,6 @@ if (!defined("DRIVER")) {
                return $connection->result("SELECT @@max_connections");
        }
 
-       $id_name = "Id";
        $jush = "sql"; ///< @var string JUSH identifier
        $types = array(); ///< @var array ($type => $maximum_unsigned_length, ...)
        $structured_types = array(); ///< @var array ($description => array($type, ...), ...)

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 87b69b2f0a17a2912d28ae2c293fc334bdeba5c5..eb59bd8353fa32d7cd012d9027daf45e2ce9df6d 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -643,7 +643,6 @@ AND typelem = 0"
                return $connection->result("SHOW max_connections");
        }
 
-       $id_name = "pid";
        $jush = "pgsql";
        $types = array();
        $structured_types = array();

diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index d798f8d8a35e9477d3c9a374f6c3b59ece4ec8d4..6ddeb7bc442af231c7dc1f85b6b0cd2eb90a3d54 100644 (file)
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -30,7 +30,7 @@ foreach (process_list() as $i => $row) {
                }
                echo "</thead>\n";
        }
-       echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row[$id_name], 0) : "");
+       echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row[$jush == "sql" ? "Id" : "pid"], 0) : "");
        foreach ($row as $key => $val) {
                echo "<td>" . (
                        ($jush == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||