Merged nijel's fix against bug #632310.
This commit is contained in:
@@ -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<42>rn T. Hallberg
|
||||
translations, thanks to me ;), Pietro Danesi, Vilius Zigmantas, Kositer
|
||||
Uros and Bj<42>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
|
||||
|
@@ -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';
|
||||
|
Reference in New Issue
Block a user