From 8b4513e16a65f2d068fe7cd3b2a36e521ca37485 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 20 Sep 2004 17:47:40 +0000
Subject: bug #1030644 importing when last table exported was empty

---
 read_dump.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'read_dump.php')

diff --git a/read_dump.php b/read_dump.php
index a1bd251f8b..5883bfa177 100644
--- a/read_dump.php
+++ b/read_dump.php
@@ -130,13 +130,16 @@ if ($sql_file != 'none') {
 
 // Kanji convert SQL textfile 2002/1/4 by Y.Kawada
 if (@function_exists('PMA_kanji_str_conv')) {
-    $sql_tmp   = trim($sql_query);
+    // do not trim here: see bug #1030644
+    //$sql_tmp   = trim($sql_query);
+    $sql_tmp   = $sql_query;
     PMA_change_enc_order();
     $sql_query = PMA_kanji_str_conv($sql_tmp, $knjenc, isset($xkana) ? $xkana : '');
     PMA_change_enc_order();
-} else {
-    $sql_query = trim($sql_query);
-}
+} //else {
+    // do not trim here: see bug #1030644
+    //$sql_query = trim($sql_query);
+//}
 
 // $sql_query come from the query textarea, if it's a reposted query gets its
 // 'true' value
-- 
cgit v1.2.3