Display search fields in order

diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index ae33238dc902e793460e62b78a5528eef00f1d57..86d8b34d86b25576ebf719243397f40c0a46f4b0 100644 (file)
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -288,6 +288,8 @@ $translations = array(
        // hint for time format - use language equivalents for hour, minute and second shortcuts
        'HH:MM:SS' => 'HH:MM:SS',
        'now' => 'teď',
+       'yes' => 'ano',
+       'no' => 'ne',
        
        // general SQLite error in create, drop or rename database
        'File exists.' => 'Soubor existuje.',

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 710785a3ecad2ebc4733df1a8551f1d8f0ed41dd..19093f96729656a9e45100a9f0a04c2a42789955 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -163,7 +163,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                        }
                }
                if (like_bool($field) && $return != " ") { // bool
-                       $return = '<img src="' . ($val ? "../adminer/static/plus.gif" : "../adminer/static/cross.gif") . '" alt="' . h($val) . '">';
+                       $return = ($val ? lang('yes') : lang('no'));
                }
                if ($link) {
                        $return = "<a href='$link'>$return</a>";
@@ -196,20 +196,16 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                }
                $i = 0;
                $fields = fields($_GET["select"]);
-               foreach ($fields as $name => $field) {
-                       $desc = $columns[$name];
-                       if (ereg("enum", $field["type"]) && $desc != "") { //! set - uses 1 << $i and FIND_IN_SET()
+               foreach ($columns as $name => $desc) {
+                       $field = $fields[$name];
+                       if (ereg("enum", $field["type"])) { //! set - uses 1 << $i and FIND_IN_SET()
                                $key = $keys[$name];
                                $i--;
                                echo "<div>" . h($desc) . "<input type='hidden' name='where[$i][col]' value='" . h($name) . "'>:";
                                echo enum_input("checkbox", " name='where[$i][val][]'", $field, (array) $where[$key]["val"], ($field["null"] ? 0 : null));
                                echo "</div>\n";
                                unset($columns[$name]);
-                       }
-               }
-               foreach ($columns as $name => $desc) {
-                       $options = $this->_foreignKeyOptions($_GET["select"], $name);
-                       if (is_array($options)) {
+                       } elseif (is_array($options = $this->_foreignKeyOptions($_GET["select"], $name))) {
                                if ($fields[$name]["null"]) {
                                        $options[0] = '(' . lang('empty') . ')';
                                }