Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2004-09-20 21:47:40 +0400
committerMarc Delisle <marc@infomarc.info>2004-09-20 21:47:40 +0400
commit8b4513e16a65f2d068fe7cd3b2a36e521ca37485 (patch)
treecbabe21f754937e2a8107ab42960d71111542d1f /read_dump.php
parent0b851a1b30ce532a5fa28bea08d5198729f3648a (diff)
bug #1030644 importing when last table exported was empty
Diffstat (limited to 'read_dump.php')
-rw-r--r--read_dump.php11
1 files changed, 7 insertions, 4 deletions
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