Editor: Fix pre-selecting empty enum

diff --git a/adminer/include/html.inc.php b/adminer/include/html.inc.php
index c3d19595345215cb30676f4295923e1f693df793..4da85d9f59c8b2648d9e2bab8cd09d238231de62 100644 (file)
--- a/adminer/include/html.inc.php
+++ b/adminer/include/html.inc.php
@@ -226,7 +226,7 @@ function hidden_fields_get() {
        echo input_hidden("username", $_GET["username"]);
 }
 
-/** Print enum input field
+/** Print enum or set input field
 * @param string "radio"|"checkbox"
 * @param string
 * @param array

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 056f49947b897fc23aed92abad7901d991d36e22..8608d10ea43a63f31205b94abe54f70cf1f8416b 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -484,7 +484,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
        function editInput($table, $field, $attrs, $value) {
                if ($field["type"] == "enum") {
                        return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "")
-                               . enum_input("radio", $attrs, $field, ($value || isset($_GET["select"]) ? $value : 0), ($field["null"] ? "" : null))
+                               . enum_input("radio", $attrs, $field, ($value || isset($_GET["select"]) ? $value : ""), ($field["null"] ? "" : null))
                        ;
                }
                $options = $this->foreignKeyOptions($table, $field["field"], $value);
@@ -494,8 +494,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
                                : "<input value='" . h($value) . "'$attrs class='hidden'>"
                                        . "<input value='" . h($options) . "' class='jsonly'>"
                                        . "<div></div>"
-                                       . script("qsl('input').oninput = partial(whisper, '" . ME . "script=complete&source=" . urlencode($table) . "&field=" . urlencode($field["field"]) . "&value=');
-qsl('div').onclick = whisperClick;", "")
+                                       . script("qsl('input').oninput = partial(whisper, '" . ME . "script=complete&source=" . urlencode($table) . "&field=" . urlencode($field["field"]) . "&value='); qsl('div').onclick = whisperClick;", "")
                        );
                }
                if (like_bool($field)) {