Name Edit button on select.inc.php

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

diff --git a/adminer/index.php b/adminer/index.php
index 80efcc1700c401b8923ae07ba5601da0cc3106d2..dda4c90c942dd941e9a9ca1b807e1de42588994c 100644 (file)
--- a/adminer/index.php
+++ b/adminer/index.php
@@ -39,8 +39,7 @@ if (isset($_GET["download"])) {
                // edit form is used for default values and distinguished by checking isset($_GET["default"]) in edit.inc.php
                $_GET["edit"] = $_GET["default"];
        }
-       if (isset($_GET["select"]) && $_POST && (!$_POST["delete"] && !$_POST["export"] && !$_POST["import"] && !$_POST["save"] && !$_POST["email"])) {
-               // POST form on select page is used to edit or clone data
+       if (isset($_GET["select"]) && ($_POST["edit"] || $_POST["clone"]) && !$_POST["save"]) {
                $_GET["edit"] = $_GET["select"];
        }
        if (isset($_GET["callf"])) {

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 5bcb1e7382911d097a46241e2cf181d3e5601363..15c88729fe41fd587773104199c5e9e33de86708 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -327,7 +327,7 @@ if (!$columns) {
                        }
                        echo " (" . lang('%d row(s)', $found_rows) . ') <label><input type="checkbox" name="all" value="1">' . lang('whole result') . "</label>\n";
                        
-                       echo (information_schema($_GET["db"]) ? "" : "<fieldset><legend>" . lang('Edit') . "</legend><div><input type='submit' value='" . lang('Edit') . "'> <input type='submit' name='clone' value='" . lang('Clone') . "'> <input type='submit' name='delete' value='" . lang('Delete') . "'$confirm></div></fieldset>\n");
+                       echo (information_schema($_GET["db"]) ? "" : "<fieldset><legend>" . lang('Edit') . "</legend><div><input type='submit' name='edit' value='" . lang('Edit') . "'> <input type='submit' name='clone' value='" . lang('Clone') . "'> <input type='submit' name='delete' value='" . lang('Delete') . "'$confirm></div></fieldset>\n");
                        echo "<fieldset><legend>" . lang('Export') . "</legend><div>$dump_output $dump_format <input type='submit' name='export' value='" . lang('Export') . "'></div></fieldset>\n";
                }
                $result->free();

diff --git a/editor/index.php b/editor/index.php
index 7cb595558c400cdaab2435a260efd1315949045c..3f559c17c9665d3ea16d5b9f9efa728526d7e975 100644 (file)
--- a/editor/index.php
+++ b/editor/index.php
@@ -23,8 +23,7 @@ if (isset($_GET["download"])) {
                // posted form with no data means exceeded post_max_size because Adminer always sends token at least
                $error = lang('Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.');
        }
-       if (isset($_GET["select"]) && $_POST && (!$_POST["delete"] && !$_POST["export"] && !$_POST["import"] && !$_POST["save"] && !$_POST["email"])) {
-               // POST form on select page is used to edit or clone data
+       if (isset($_GET["select"]) && ($_POST["edit"] || $_POST["clone"]) && !$_POST["save"]) {
                $_GET["edit"] = $_GET["select"];
        }
        if (isset($_GET["edit"])) {