Remove confusion between type and Type

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@730 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index e51417af30c669e4a918a05d86585909e120bcd8..11e81c95ca78562afc5882be9fd7c33e74e05a3e 100644 (file)
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -235,7 +235,7 @@ function fields($table) {
                        preg_match('~^([^( ]+)(?:\\((.+)\\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
                        $return[$row["Field"]] = array(
                                "field" => $row["Field"],
-                               "Type" => $row["Type"],
+                               "full_type" => $row["Type"],
                                "type" => $match[1],
                                "length" => $match[2],
                                "unsigned" => ltrim($match[3] . $match[4]),

diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 89fd50cef86c681ce5507cbc74a3ee7721da3806..5af1f4772f3b0be6da7316b1b605130554159256 100644 (file)
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -65,7 +65,7 @@ foreach ($schema as $name => $table) {
        echo '<a href="' . htmlspecialchars($SELF) . 'table=' . urlencode($name) . '"><strong>' . htmlspecialchars($name) . "</strong></a><br />\n";
        foreach ($table["fields"] as $field) {
                $val = htmlspecialchars($field["field"]);
-               $title = ' title="' . htmlspecialchars($field["Type"] . ($field["null"] ? " " . lang('NULL') : '')) . '"';
+               $title = ' title="' . htmlspecialchars($field["full_type"] . ($field["null"] ? " " . lang('NULL') : '')) . '"';
                if (preg_match('~char|text~', $field["type"])) {
                        $val = "<span class='char'$title>$val</span>";
                } elseif (preg_match('~date|time|year~', $field["type"])) {