Print \n as <br />, not
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@736 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
parent
52f68a6763
commit
a69fff7e71
|
@ -207,7 +207,7 @@ function select($result, $dbh2 = null) {
|
||||||
} else {
|
} else {
|
||||||
if ($blobs[$key] && !is_utf8($val)) {
|
if ($blobs[$key] && !is_utf8($val)) {
|
||||||
$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
|
$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
|
||||||
} elseif (!strlen(trim($val))) {
|
} elseif (!strlen(trim($val, " \t"))) {
|
||||||
$val = " "; // some content to print a border
|
$val = " "; // some content to print a border
|
||||||
} else {
|
} else {
|
||||||
$val = nl2br(htmlspecialchars($val));
|
$val = nl2br(htmlspecialchars($val));
|
||||||
|
|
|
@ -263,7 +263,7 @@ if (!$columns) {
|
||||||
} elseif (preg_match('~blob|binary~', $fields[$key]["type"]) && !is_utf8($val)) {
|
} elseif (preg_match('~blob|binary~', $fields[$key]["type"]) && !is_utf8($val)) {
|
||||||
$val = '<a href="' . htmlspecialchars($SELF) . 'download=' . urlencode($_GET["select"]) . '&field=' . urlencode($key) . '&' . $unique_idf . '">' . lang('%d byte(s)', strlen($val)) . '</a>';
|
$val = '<a href="' . htmlspecialchars($SELF) . 'download=' . urlencode($_GET["select"]) . '&field=' . urlencode($key) . '&' . $unique_idf . '">' . lang('%d byte(s)', strlen($val)) . '</a>';
|
||||||
} else {
|
} else {
|
||||||
if (!strlen(trim($val))) {
|
if (!strlen(trim($val, " \t"))) {
|
||||||
$val = " ";
|
$val = " ";
|
||||||
} elseif (intval($text_length) > 0 && preg_match('~blob|text~', $fields[$key]["type"])) {
|
} elseif (intval($text_length) > 0 && preg_match('~blob|text~', $fields[$key]["type"])) {
|
||||||
$val = nl2br(shorten_utf8($val, intval($text_length)));
|
$val = nl2br(shorten_utf8($val, intval($text_length)));
|
||||||
|
|
Loading…
Reference in a new issue