nl2br

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

diff --git a/select.inc.php b/select.inc.php
index 99fa4fad24a370b63dd9f275a6f22831bd7e8561..d8e11d27ca932c650d03c720ab110ce35ea521f8 100644 (file)
--- a/select.inc.php
+++ b/select.inc.php
@@ -93,7 +93,7 @@ if (!mysql_num_rows($result)) {
                        if (!isset($val)) {
                                $val = "<i>NULL</i>";
                        } else {
-                               $val = (strlen(trim($val)) ? htmlspecialchars($val) : "&nbsp;");
+                               $val = (strlen(trim($val)) ? nl2br(htmlspecialchars($val)) : "&nbsp;");
                                foreach ((array) $foreign_keys[$key] as $foreign_key) {
                                        if (count($foreign_keys[$key]) == 1 || count($foreign_key[2]) == 1) {
                                                $val = '">' . "$val</a>";

diff --git a/sql.inc.php b/sql.inc.php
index 422e5b420846017c9de3a7001bc4a6f1c3d5637b..1ff69a5a964a558bcf258e224f9bf5e6787f7334 100644 (file)
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -6,7 +6,7 @@ if ($_POST) {
        }
        $error = mysql_error();
 }
-page_header(lang('SQL command'), (strlen($_GET["db"]) ? "" : "db"));
+page_header(lang('SQL command'));
 
 if ($_POST) {
        if (!$result) {
@@ -22,7 +22,7 @@ if ($_POST) {
                                }
                                echo "<tr>";
                                foreach ($row as $val) {
-                                       echo "<td>" . (isset($val) ? htmlspecialchars($val) : "<i>NULL</i>") . "</td>";
+                                       echo "<td>" . (isset($val) ? nl2br(htmlspecialchars($val)) : "<i>NULL</i>") . "</td>";
                                }
                                echo "</tr>\n";
                        }