Type char can be translated to description

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

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 61437d81278beb3e0bb5890f8e7fae6959fa4cbb..7575b2a714c20a88fa6f784e6d173213b7ed7310 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -105,7 +105,7 @@ function adminer_row_descriptions($rows, $foreign_keys) {
 * @return string
 */
 function adminer_select_val($val, $link) {
-       return call_adminer('select_val', ($link ? '<a href="' . $link . '">' . $val . '</a>' : $val), $val, $link);
+       return call_adminer('select_val', ($link ? "<a href=\"$link\">$val</a>" : $val), $val, $link);
 }
 
 /** Query printed after execution in the message

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 9e32d745e5904b7a8e23ad1b6bedea2cbdcc29e9..788adb29093f3e10b452fd0d01f7fc2756cfc862 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -101,7 +101,10 @@ function adminer_row_descriptions($rows, $foreign_keys) {
 }
 
 function adminer_select_val($val, $link) {
-       return call_adminer('select_val', ($link ? "<a href=\"$link\">$val</a>" : ($val == "<i>NULL</i>" ? "" : $val)), $val, $link);
+       return call_adminer('select_val', ($link ?
+               "<a href=\"$link\">$val</a>" :
+               ($val == "<i>NULL</i>" ? "" : preg_replace('~^<code>(.*)</code>$~', '\\1', $val))
+       ), $val, $link);
 }
 
 function adminer_message_query($query) {