Display search fields in order

vrana · Aug 24, 2011 · 3a333e9 · 3a333e9
1 parent 9d944c8
commit 3a333e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
@@ -288,6 +288,8 @@
 	// 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
@@ -163,7 +163,7 @@ function selectVal($val, $link, $field) {
 			}
 		}
 		if (like_bool($field) && $return != "&nbsp;") { // 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 @@ function selectSearchPrint($where, $columns, $indexes) {
 		}
 		$i = 0;
 		$fields = fields($_GET["select"]);
-		foreach ($fields as $name => $field) {
+		foreach ($columns as $name => $desc) {
-			$desc = $columns[$name];
+			$field = $fields[$name];
-			if (ereg("enum", $field["type"]) && $desc != "") { //! set - uses 1 << $i and FIND_IN_SET()
+			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]);
-			}
+			} elseif (is_array($options = $this->_foreignKeyOptions($_GET["select"], $name))) {
-		}
-		foreach ($columns as $name => $desc) {
-			$options = $this->_foreignKeyOptions($_GET["select"], $name);
-			if (is_array($options)) {
 				if ($fields[$name]["null"]) {
 					$options[0] = '(' . lang('empty') . ')';
 				}