Allow dropping remote foreign key

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1246 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/foreign.inc.php b/adminer/foreign.inc.php
index f59a6552f75cb9d0e82b082903a79d6da537ff3d..25f3776f6fef8f1d7049030c735b1ad8f6924511 100644 (file)
--- a/adminer/foreign.inc.php
+++ b/adminer/foreign.inc.php
@@ -43,6 +43,7 @@ $target = ($TABLE === $row["table"] ? $source : array_keys(fields($row["table"])
 
 <form action="" method="post">
 <p>
+<?php if (!strlen($row["db"])) { ?>
 <?php echo lang('Target table'); ?>:
 <?php echo html_select("table", array_keys(table_status_referencable()), $row["table"], "this.form['change-js'].value = '1'; this.form.submit();"); ?>
 <input type="hidden" name="change-js" value="">
@@ -64,8 +65,9 @@ foreach ($row["source"] as $key => $val) {
 <?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + $on_actions, $row["on_delete"]); ?>
  <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + $on_actions, $row["on_update"]); ?>
 <p>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if (strlen($_GET["name"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 <noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>"></noscript>
+<?php } ?>
+<?php if (strlen($_GET["name"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
+<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

diff --git a/adminer/table.inc.php b/adminer/table.inc.php
index a3677f1117c2ef984afec08c735b103e337976c0..742723ed5175cd97b4b73f8e60c3863217ae100e 100644 (file)
--- a/adminer/table.inc.php
+++ b/adminer/table.inc.php
@@ -49,7 +49,7 @@ if ($fields) {
                                        echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
                                        echo "<td><a href='" . h(strlen($foreign_key["db"]) ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ME) . "table=" . urlencode($foreign_key["table"]) . "'>$link</a>";
                                        echo "(<em>" . implode("</em>, <em>", array_map('h', $foreign_key["target"])) . "</em>)";
-                                       echo "<td>" . (!strlen($foreign_key["db"]) ? '<a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>' : '&nbsp;');
+                                       echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
                                }
                                echo "</table>\n";
                        }