diff --git a/adminer/call.inc.php b/adminer/call.inc.php
index cc4666a7..509f9f97 100644
--- a/adminer/call.inc.php
+++ b/adminer/call.inc.php
@@ -57,7 +57,7 @@ if ($in) {
if (strlen($value) && ($field["type"] == "enum" || $field["type"] == "set")) {
$value = intval($value);
}
- input($key, $field, $value, (string) $_POST["function"][$name]); // param name can be empty
+ input($field, $value, (string) $_POST["function"][$name]); // param name can be empty
echo "\n";
}
echo "\n";
diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 802f8f48..157d5c5c 100644
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -79,7 +79,7 @@ if ($fields) {
: ($_POST["clone"] && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : $field["default"]))
);
$function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($where && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
- input($name, $field, $value, $function);
+ input($field, $value, $function);
if (isset($_GET["default"]) && $field["type"] == "timestamp") {
if (!isset($create) && !$_POST) {
//! disable sql_mode NO_FIELD_OPTIONS
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 25965c53..d5814d44 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -90,9 +90,17 @@ function adminer_select_query($query) {
return call_adminer('select_query', "
" . htmlspecialchars($query) . "
" . lang('Edit') . "\n", $query);
}
-/** Descriptions of selected data
+/** Description of a row in a table
+* @param string
+* @return string SQL expression, empty string for no description
+*/
+function adminer_row_description($table) {
+ return call_adminer('row_description', "", $table);
+}
+
+/** Get descriptions of selected data
* @param array all data to print
-* @param array foreign keys
+* @param array
* @return array
*/
function adminer_row_descriptions($rows, $foreign_keys) {
@@ -147,7 +155,16 @@ function adminer_edit_functions($field) {
if ($field["null"] || isset($_GET["default"])) {
array_unshift($return, "NULL");
}
- return call_adminer('edit_functions', $return, $field);
+ return call_adminer('edit_functions', (isset($_GET["select"]) ? array("orig" => lang('original')) : array()) + $return, $field);
+}
+
+/** Get options to display edit field
+* @param string table name
+* @param array single field from fields()
+* @return array options for