From 4ab699c90ff97189f4895aa41f91262d7ba16d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20M=C3=BCller?= <om@omnis.ch>
Date: Sun, 19 Aug 2001 12:46:17 +0000
Subject: [PATCH]         * db_readdump.php3: if file contains mutiple queries,
 only show this line:           "Your SQL-query has been executed
 successfully: The content of your            file has been inserted. (131
 Instructions)" instead of showing twice            (result + textarea) the
 whole file, which could be problematic with            large dumps.         *
 db_details: removed $sql_query_cpy stuff (was used by db_readdump.php3)

---
 ChangeLog        | 11 ++++++++++-
 db_details.php3  |  7 +------
 db_readdump.php3 |  9 +++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b39705197..cbda30f73 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,13 +5,22 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-08-19  Olivier Müller  <om@omnis.ch>
+	* db_readdump.php3: if file contains mutiple queries, only show this line:
+	  "Your SQL-query has been executed successfully: The content of your 
+           file has been inserted. (131 Instructions)" instead of showing twice
+           (result + textarea) the whole file, which could be problematic with
+           large dumps.
+	* db_details: removed $sql_query_cpy stuff (was used by db_readdump.php3)
+	* lang/*: $strInstructions (used in db_readdump.php3)
+
 2001-08-19  Loïc Chapeaux  <lolo@phpheaven.net>
 	* tbl_change.php3: do not modify blob/binaries if $cfgProtectBlob is true
 	  and merged a little optimization (lines 69-71).
 	* main.php3; db_details.php3; tbl_properties.php3; db_readdump.php3;
 	  lib.inc.php3: once a query has been executed phpMyAdmin now moves back
 	  to the calling script (rather than db_details.php3 everytime) as soon as
-      the current database/table exists, else it moves  back to a "parent"
+	  the current database/table exists, else it moves  back to a "parent"
 	  script (the welcome page/'db_details.php3' if the current
 	  database/table has has been dropped.
 
diff --git a/db_details.php3 b/db_details.php3
index 1b19ec7f6..49e024d35 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -309,12 +309,7 @@ $url_query = 'lang=' . $lang
            . '&db=' . urlencode($db)
            . '&goto=db_details.php3';
 if (isset($show_query) && $show_query == 'y') {
-    // This script has been called by db_readdump.php3
-    if (isset($sql_query_cpy)) {
-        $query_to_display = $sql_query_cpy;
-    }
-    // Other cases
-    else if (get_magic_quotes_gpc()) {
+    if (get_magic_quotes_gpc()) {
         $query_to_display = stripslashes($sql_query);
     }
     else {
diff --git a/db_readdump.php3 b/db_readdump.php3
index dcfee911d..df0da23d9 100755
--- a/db_readdump.php3
+++ b/db_readdump.php3
@@ -70,9 +70,6 @@ if (!empty($prev_sql_query)) {
     }
 }
 
-// Copy the query, used for display purposes only
-$sql_query_cpy = $sql_query;
-
 
 /**
  * Executes the query
@@ -120,6 +117,9 @@ if ($sql_query != '') {
 } // end if
 
 
+// be nice with bandwidth... 
+$sql_query = "";
+
 /**
  * Go back to the calling script
  */
@@ -127,7 +127,8 @@ require('./header.inc.php3');
 if (isset($my_die)) {
     mysql_die('', $my_die);
 }
-$message   = $strSuccess;
+
+$message   = "$strSuccess: $strTheContent ($pieces_count $strInstructions) &nbsp;";
 if (!isset($goto)
     || ($goto != 'db_details.php3' && $goto != 'tbl_properties.php3')) {
     $goto = 'db_details.php3';