From eac7d042eddb1e2eb0b822cd3bbd0a53aa7383f3 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 25 Mar 2025 21:58:43 +0100
Subject: [PATCH] Avoid <optgroup> in <datalist>

---
 adminer/create.inc.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index 953cd590..075fbf33 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -168,6 +168,9 @@ if (!$_POST) {
 }
 
 $collations = collations();
+if (is_array(reset($collations))) {
+	$collations = call_user_func_array('array_merge', array_values($collations));
+}
 $engines = $driver->engines();
 // case of engine may differ
 foreach ($engines as $engine) {
@@ -185,7 +188,7 @@ if (support("columns") || $TABLE == "") {
 	echo lang('Table name') . ": <input name='name'" . ($TABLE == "" && !$_POST ? " autofocus" : "") . " data-maxlength='64' value='" . h($row["name"]) . "' autocapitalize='off'>\n";
 	echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . on_help("event.target.value", 1) . script("qsl('select').onchange = helpClose;") . "\n" : "");
 	if ($collations) {
-		echo "<datalist id='collations'>" . optionlist($collations) . "</datalist>";
+		echo "<datalist id='collations'>" . optionlist($collations) . "</datalist>\n";
 		echo (preg_match("~sqlite|mssql~", JUSH) ? "" : "<input list='collations' name='Collation' value='" . h($row["Collation"]) . "' placeholder='(" . lang('collation') . ")'>");
 	}
 	echo "<input type='submit' value='" . lang('Save') . "'>\n";