Highlight table being altered in navigation

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index a91b764afd3d98bbc00a2ffc33e14b8ad0a2e094..2ecf685fb74953d82b2816d554f3935e902d2b70 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -841,8 +841,8 @@ username.form['auth[driver]'].onchange();
        function tablesPrint($tables) {
                echo "<p id='tables' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
                foreach ($tables as $table => $status) {
-                       echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table) . ">" . lang('select') . "</a> ";
-                       echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '"' . bold($_GET["table"] == $table) . " title='" . lang('Show structure') . "'>" . $this->tableName($status) . "</a><br>\n";
+                       echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table) . ">" . lang('select') . "</a> ";
+                       echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '"' . bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"]))) . " title='" . lang('Show structure') . "'>" . $this->tableName($status) . "</a><br>\n";
                }
        }
        

diff --git a/changes.txt b/changes.txt
index ea2c5d7c29706f55ccebc1741800499e90d67683..2139da8f5e76d153fd6422e12fc2c814dfdf1f7e 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -6,6 +6,7 @@ Don't check previous checkbox on added column in create table (bug #3614245)
 Order table list by name
 Verify UTF-8 encoding of CSV import
 Notify user about expired master password for permanent login
+Highlight table being altered in navigation
 Send 404 for invalid database and schema
 Fix title and links on invalid table pages
 Display error on invalid alter table and view pages

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index deec655d682c0ca7e7ef67d3e1e2575014d078e9..efa8b160ff9e7b71a061fd4e5fa97d249e50c019 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -583,7 +583,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                foreach ($tables as $row) {
                        $name = $this->tableName($row);
                        if (isset($row["Engine"]) && $name != "") { // ignore views and tables without name
-                               echo "<a href='" . h(ME) . 'select=' . urlencode($row["Name"]) . "'" . bold($_GET["select"] == $row["Name"]) . " title='" . lang('Select data') . "'>$name</a><br>\n";
+                               echo "<a href='" . h(ME) . 'select=' . urlencode($row["Name"]) . "'" . bold($_GET["select"] == $row["Name"] || $_GET["edit"] == $row["Name"]) . " title='" . lang('Select data') . "'>$name</a><br>\n";
                        }
                }
        }