beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Always call select_val

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@868 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-07-21 16:22:42 +00:00
parent 08d62579b0
commit 5911cf177d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adminer/select.inc.php
View file

@ -319,10 +319,12 @@ if (!$columns) {
if (strlen($val) && (!isset($email_fields[$key]) || $email_fields[$key])) { if (strlen($val) && (!isset($email_fields[$key]) || $email_fields[$key])) {
$email_fields[$key] = is_email($val); //! filled e-mails may be contained on other pages $email_fields[$key] = is_email($val); //! filled e-mails may be contained on other pages
} }
$link = "";
if (!isset($val)) { if (!isset($val)) {
$val = "<i>NULL</i>"; $val = "<i>NULL</i>";
} elseif (ereg('blob|binary', $fields[$key]["type"]) && !is_utf8($val)) { //! download link may be printed even with is_utf8 } elseif (ereg('blob|binary', $fields[$key]["type"]) && !is_utf8($val)) { //! download link may be printed even with is_utf8
$val = '<a href="' . htmlspecialchars($SELF) . 'download=' . urlencode($_GET["select"]) . '&amp;field=' . urlencode($key) . '&amp;' . $unique_idf . '">' . lang('%d byte(s)', strlen($val)) . '</a>'; $link = htmlspecialchars($SELF . 'download=' . urlencode($_GET["select"]) . '&field=' . urlencode($key) . '&') . $unique_idf;
$val = lang('%d byte(s)', strlen($val));
} else { } else {
if (!strlen(trim($val, " \t"))) { if (!strlen(trim($val, " \t"))) {
$val = "&nbsp;"; $val = "&nbsp;";
@ -336,7 +338,6 @@ if (!$columns) {
} }
// link related items // link related items
$link = "";
foreach ((array) $foreign_keys[$key] as $foreign_key) { foreach ((array) $foreign_keys[$key] as $foreign_key) {
if (count($foreign_keys[$key]) == 1 || count($foreign_key["source"]) == 1) { if (count($foreign_keys[$key]) == 1 || count($foreign_key["source"]) == 1) {
foreach ($foreign_key["source"] as $i => $source) { foreach ($foreign_key["source"] as $i => $source) {
@ -346,8 +347,8 @@ if (!$columns) {
break; break;
} }
} }
$val = adminer_select_val($val, $link);
} }
$val = adminer_select_val($val, $link);
echo "<td>$val"; echo "<td>$val";
} }
} }