From 60555c5736883b1c4a11f3714da662e6e3671ac2 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Mon, 24 Mar 2025 06:41:31 +0100 Subject: [PATCH] Editor: Fix pre-selecting empty enum --- adminer/include/html.inc.php | 2 +- editor/include/adminer.inc.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/adminer/include/html.inc.php b/adminer/include/html.inc.php index c3d19595..4da85d9f 100644 --- 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 056f4994..8608d10e 100644 --- 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"]) ? " " : "") - . 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 : "" . "" . "
" - . 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)) {