Respect zero text length
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@889 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
parent
dfda295859
commit
35c8c6baa4
|
@ -245,7 +245,7 @@ if (!$columns) {
|
||||||
|
|
||||||
if (isset($text_length)) {
|
if (isset($text_length)) {
|
||||||
echo "<fieldset><legend>" . lang('Text length') . "</legend><div>";
|
echo "<fieldset><legend>" . lang('Text length') . "</legend><div>";
|
||||||
echo "<input name='text_length' size='3' value=\"" . htmlspecialchars($text_length) . "\">";
|
echo '<input name="text_length" size="3" value="' . htmlspecialchars($text_length) . '">';
|
||||||
echo "</div></fieldset>\n";
|
echo "</div></fieldset>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -317,8 +317,8 @@ if (!$columns) {
|
||||||
} else {
|
} else {
|
||||||
if (!strlen(trim($val, " \t"))) {
|
if (!strlen(trim($val, " \t"))) {
|
||||||
$val = " ";
|
$val = " ";
|
||||||
} elseif (intval($text_length) > 0 && ereg('blob|text', $fields[$key]["type"])) {
|
} elseif (strlen($text_length) && ereg('blob|text', $fields[$key]["type"])) {
|
||||||
$val = nl2br(shorten_utf8($val, intval($text_length))); // usage of LEFT() would reduce traffic but complicates query
|
$val = nl2br(shorten_utf8($val, max(0, intval($text_length)))); // usage of LEFT() would reduce traffic but complicate query
|
||||||
} else {
|
} else {
|
||||||
$val = nl2br(htmlspecialchars($val));
|
$val = nl2br(htmlspecialchars($val));
|
||||||
if ($fields[$key]["type"] == "char") {
|
if ($fields[$key]["type"] == "char") {
|
||||||
|
|
Loading…
Reference in a new issue