Show type by field name (thanks to Jakub Sochor)

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

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 5bc0c6843efac5c5fec88b80610d44b055bdb4a5..633fab650709ad68fd5cbfc13931fd736d7c78a4 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -35,7 +35,7 @@ function adminer_table_name($row) {
 * @return string
 */
 function adminer_field_name($fields, $key) {
-       return call_adminer('field_name', htmlspecialchars($key), $fields, $key);
+       return call_adminer('field_name', '<span title="' . htmlspecialchars($fields[$key]["full_type"]) . '">' . htmlspecialchars($key) . '</span>', $fields, $key);
 }
 
 /** Links after select heading

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 52427d2c344d76db86c8769c93fa1bfedbb10803..cd86f32aa15f385415f32a51fecc4f3f3d1f0ce2 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -13,7 +13,7 @@ $columns = array(); // selectable columns
 unset($text_length);
 foreach ($fields as $key => $field) {
        if (isset($field["privileges"]["select"])) {
-               $columns[$key] = adminer_field_name($fields, $key); //! numeric $key is problematic in optionlist()
+               $columns[$key] = strip_tags(adminer_field_name($fields, $key)); //! numeric $key is problematic in optionlist()
                if (preg_match('~text|blob~', $field["type"])) {
                        $text_length = (isset($_GET["text_length"]) ? $_GET["text_length"] : "100");
                }