From e2515922f3c57fb548c7bccc3b17d00e46d0f918 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 5 Nov 2002 15:12:00 +0000
Subject: [PATCH] Merged nijel's fix against bug #632310.

---
 ChangeLog     | 5 +++--
 tbl_dump.php3 | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fb041fdb6..dd1859eee 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,8 +14,9 @@ $Source$
 
 2002-11-05 Michal Cihar  <nijel@users.sourceforge.net>
     * lang/{czech,italian,lithuanian,slovenian,swedish}*.php3: updated
-      translations, thanks to me ;), Pietro Danesi, Vilius Zigmantas. Kositer
-      Uros and Björn T. Hallberg
+      translations, thanks to me ;), Pietro Danesi, Vilius Zigmantas, Kositer
+      Uros and Björn T. Hallberg.
+    * tbl_dump.php3: Fixed bug #632310 (Export fails with UTF-8).
 
 2002-11-05 Marc Delisle  <lem9@users.sourceforge.net>
     * main.php3: when the user does not have required privs to create
diff --git a/tbl_dump.php3 b/tbl_dump.php3
index d504260ac..d2052d991 100755
--- a/tbl_dump.php3
+++ b/tbl_dump.php3
@@ -146,9 +146,14 @@ if (empty($asfile)) {
 else {
     // Defines filename and extension, and also mime types
     if (!isset($table)) {
-        $filename = PMA_convert_string($convcharset, 'iso8859-1', $db);
+        $filename = $db;
     } else {
-        $filename = PMA_convert_string($charset, 'iso8859-1', $table);
+        $filename = $table;
+    }
+    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
+        $filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
+    } else {
+        $filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename);
     }
     if (isset($bzip) && $bzip == 'bzip') {
         $ext       = 'bz2';