Display bit default value same as existing values

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 08892e940521c067acd79e02f7eace6faa458208..49849681fab5afaf7dc28e74c0076d57852f19ba 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -84,9 +84,15 @@ if (!$fields) {
        foreach ($fields as $name => $field) {
                echo "<tr><th>" . $adminer->fieldName($field);
                $default = $_GET["set"][bracket_escape($name)];
+               if ($default === null) {
+                       $default = $field["default"];
+                       if ($field["type"] == "bit" && ereg("^b'([01]*)'\$", $default, $regs)) {
+                               $default = $regs[1];
+                       }
+               }
                $value = ($row !== null
                        ? ($row[$name] != "" && $jush == "sql" && ereg("enum|set", $field["type"]) ? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name]) : $row[$name])
-                       : (!$update && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : ($default !== null ? $default : $field["default"])))
+                       : (!$update && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : $default))
                );
                if (!$_POST["save"] && is_string($value)) {
                        $value = $adminer->editVal($value, $field);

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index b88b648c1eb6c03cbd1becbd0072b5950d6aa5cc..0a92e068be2d17d37d87f280e709b75d244c60c0 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -545,7 +545,7 @@ username.form['auth[driver]'].onchange();
                        return $value; // SQL injection
                }
                $name = $field["field"];
-               $return = ($field["type"] == "bit" && ereg("^([0-9]+|b'[0-1]+')\$", $value) ? $value : q($value));
+               $return = q($value);
                if (ereg('^(now|getdate|uuid)$', $function)) {
                        $return = "$function()";
                } elseif (ereg('^current_(date|timestamp)$', $function)) {