Offer original values in multi-row editing (regression from 4.16.0)

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 196f70be67501ce726c7fa55952c2d33992104c5..5fae055378f7b4e4e9bcf3b4191906ef56576c69 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -202,7 +202,11 @@ function optionlist($options, $selected = null, $use_keys = false) {
                        $opts = $v;
                }
                foreach ($opts as $key => $val) {
-                       $return .= '<option' . ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '') . (($use_keys || is_string($key) ? (string) $key : $val) === (string) $selected ? ' selected' : '') . '>' . h($val);
+                       $return .= '<option'
+                               . ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '')
+                               . ($selected !== null && ($use_keys || is_string($key) ? (string) $key : $val) === $selected ? ' selected' : '')
+                               . '>' . h($val)
+                       ;
                }
                if (is_array($v)) {
                        $return .= '</optgroup>';

diff --git a/changes.txt b/changes.txt
index a4f76d67166e08c40eae90388f6f7262f9a7b6e9..0e4e0564db156f0c084451ba3db2038fbb31982c 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 4.17.0-dev:
 Hide index column options by default
+Offer original values in multi-row editing (regression from 4.16.0)
 MySQL, PostgreSQL, MS SQL: Support CHECK constraint
 MySQL: Don't offer empty enum value in edit
 PostgreSQL: Link user defined types