mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-24 15:12:51 +02:00
Code Issues Releases Wiki Activity

Don't print query in edit

Browse Source
This commit is contained in:
Jakub Vrana
2014-01-10 21:32:07 -08:00
parent dbf5eede9d
commit 2ecff21280
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
adminer/include/adminer.inc.php
View File

@@ -220,12 +220,13 @@ username.form['auth[driver]'].onchange();
* @param string HTML-escaped value to print
* @param string link to foreign key
* @param array single field returned from fields()
* @param array original value before applying editVal() and escaping
* @return string
*/
function selectVal($val, $link, $field) {
function selectVal($val, $link, $field, $original) {
$return = ($val === null ? "<i>NULL</i>" : (preg_match("~char|binary~", $field["type"]) && !preg_match("~var~", $field["type"]) ? "<code>$val</code>" : $val));
if (preg_match('~blob|bytea|raw|file~', $field["type"]) && !is_utf8($val)) {
$return = lang('%d byte(s)', strlen(html_entity_decode($val, ENT_QUOTES)));
$return = lang('%d byte(s)', strlen($original));
}
return ($link ? "<a href='" . h($link) . "'>$return</a>" : $return);
}

17
adminer/include/functions.inc.php
View File

@@ -1041,18 +1041,17 @@ function select_value($val, $link, $field, $text_length) {
);
}
}
$val = $adminer->editVal($val, $field);
if ($val !== null) {
if ($val === "") { // === - may be int
$val = "&nbsp;";
} elseif ($text_length != "" && is_shortable($field)) {
$val = shorten_utf8($val, max(0, +$text_length)); // usage of LEFT() would reduce traffic but complicate query - expected average speedup: .001 s VS .01 s on local network
$return = $adminer->editVal($val, $field);
if ($return !== null) {
if ($return === "") { // === - may be int
$return = "&nbsp;";
} elseif ($text_length != "" && is_shortable($field) && is_utf8($return)) {
$return = shorten_utf8($return, max(0, +$text_length)); // usage of LEFT() would reduce traffic but complicate query - expected average speedup: .001 s VS .01 s on local network
} else {
$val = h($val);
$return = h($return);
}
}
$val = $adminer->selectVal($val, $link, $field);
return $val;
return $adminer->selectVal($return, $link, $field, $val);
}
/** Check whether the string is e-mail address