Newlines in export

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

diff --git a/dump.inc.php b/dump.inc.php
index 8cd29387def55eeb337cdb74ee869f8ee2a0aff6..2ca198b717502561d1e7c9fef5c175d9235a2d3b 100644 (file)
--- a/dump.inc.php
+++ b/dump.inc.php
@@ -32,7 +32,7 @@ if ($_POST) {
                                $result->free();
                        }
                        if ($style && $_POST["format"] != "csv") {
-                               echo "USE " . idf_escape($db) . ";\n";
+                               echo "USE " . idf_escape($db) . ";\n\n";
                                if ($mysql->server_info >= 5) {
                                        $out = "";
                                        foreach (array("FUNCTION", "PROCEDURE") as $routine) {
@@ -64,6 +64,8 @@ if ($_POST) {
                                                        dump_data($row["Name"], $_POST["data"][$key]);
                                                        if ($ext == "tar") {
                                                                echo tar_file((strlen($_GET["db"]) ? "" : "$db/") . "$row[Name].csv", ob_get_clean());
+                                                       } elseif ($_POST["format"] != "csv") {
+                                                               echo "\n";
                                                        }
                                                } elseif ($_POST["format"] != "csv") {
                                                        $views[$row["Name"]] = $_POST["tables"][$key];

diff --git a/export.inc.php b/export.inc.php
index b7ecb15ec0a289a38641b8a959c9e9ca43b2bdfa..48794a30be73433b8c6c650eb380d01d46cb24fb 100644 (file)
--- a/export.inc.php
+++ b/export.inc.php
@@ -171,9 +171,6 @@ function dump_data($table, $style, $from = "") {
                        }
                        $result->free();
                }
-               if ($_POST["format"] != "csv") {
-                       echo "\n";
-               }
        }
 }