Display original value in clone

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

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index a63343517ddb1cc4040b17d958d047927944c186..5dca700ba8296fad0daa8e2dbe2fe2cc0b119fcb 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -1,6 +1,6 @@
 <?php
-$where = (isset($_GET["select"]) ? "" : where($_GET));
-$update = ($where || $_POST["edit"]);
+$where = (isset($_GET["select"]) ? (count($_POST["check"]) == 1 ? where_check($_POST["check"][0]) : "") : where($_GET));
+$update = (isset($_GET["select"]) ? $_POST["edit"] : $where);
 $fields = fields($_GET["edit"]);
 foreach ($fields as $name => $field) {
        if (!isset($field["privileges"][$update ? "update" : "insert"]) || !strlen($adminer->fieldName($field))) {
@@ -55,7 +55,7 @@ if ($_POST["save"]) {
        }
        $row = array();
        if ($select) {
-               $result = $dbh->query("SELECT " . implode(", ", $select) . " FROM " . idf_escape($_GET["edit"]) . " WHERE $where LIMIT 1");
+               $result = $dbh->query("SELECT " . implode(", ", $select) . " FROM " . idf_escape($_GET["edit"]) . " WHERE $where " . (isset($_GET["select"]) ? "HAVING COUNT(*) = 1" : "LIMIT 1"));
                $row = $result->fetch_assoc();
                $result->free();
        }
@@ -77,7 +77,7 @@ if ($fields) {
                if (!$_POST["save"] && is_string($value)) {
                        $value = $adminer->editVal($value, $field);
                }
-               $function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($where && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
+               $function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($update && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
                if ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
                        $value = "";
                        $function = "now";