From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 9 Aug 2013 02:34:40 +0000 (-0700)
Subject: SQLite: Don't overwrite first type by unknown type
X-Git-Tag: v4.0.0~59
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=1dcde25561a04c3bd0ffa1e14387db4d601eeeb7;p=adminer.git

SQLite: Don't overwrite first type by unknown type
---

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index d3c9978e..da1cb5be 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -141,12 +141,10 @@ function edit_type($key, $field, $collations, $foreign_keys = array()) {
 	$type = $field["type"];
 	?>
 <td><select name="<?php echo $key; ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"<?php echo on_help("getTarget(event).value", 1); ?>><?php
-echo optionlist(
-	(!$type || isset($types[$type]) || isset($foreign_keys[$type]) ? array() : array($type))
-		+ $structured_types
-		+ ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array())
-	, $type
-);
+if ($type && !isset($types[$type]) && !isset($foreign_keys[$type])) {
+	array_unshift($structured_types, $type);
+}
+echo optionlist($structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $type);
 ?></select>
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"<?php echo (!$field["length"] && preg_match('~var(char|binary)$~', $type) ? " class='required'" : ""); ?> onchange="editingLengthChange(this);" onkeyup="this.onchange();"><td class="options"><?php //! type="number" with enabled JavaScript
 	echo "<select name='$key" . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';